Skip to content

Commit e9ef8ca

Browse files
author
Darth Vader
committed
Merge commit '955b9c1f271ea37ee5fdcfdd5512715ab405b4a0'
2 parents 1c13f59 + 955b9c1 commit e9ef8ca

File tree

4 files changed

+59
-42
lines changed

4 files changed

+59
-42
lines changed

‎src/phast/PhreeqcRM/.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
strategy:
350350
fail-fast: false
351351
matrix:
352-
os: [macos-12, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
352+
os: [macos-13, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
353353
build_shared_libs: [OFF, ON]
354354
phreeqcrm_with_yaml_cpp: [OFF, ON]
355355
BUILD_TYPE: [Debug, Release]
@@ -400,10 +400,10 @@ jobs:
400400
sudo apt-get -y update
401401
sudo apt-get install -y ninja-build valgrind
402402
403-
- name: Install ninja (macOS)
403+
- name: Install ninja swig (macOS)
404404
if: ${{ runner.os == 'macOS' }}
405405
run: |
406-
brew install ninja
406+
brew install ninja swig
407407
ls -alR /usr/local/Cellar/
408408
409409
- name: Install yaml-cpp (Linux)
@@ -516,15 +516,15 @@ jobs:
516516
strategy:
517517
fail-fast: false
518518
matrix:
519-
os: [macos-12, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
519+
os: [macos-13, ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022]
520520
build_shared_libs: [ON]
521521
phreeqcrm_with_yaml_cpp: [ON]
522522
mpi: ['mpich', 'ompi', 'impi', 'msmpi'] # see https://github.com/mpi4py/setup-mpi/blob/master/setup-mpi.sh
523523
# BUILD_TYPE: [Debug, Release]
524524
exclude:
525-
- os: macos-12
525+
- os: macos-13
526526
mpi: 'impi'
527-
- os: macos-12
527+
- os: macos-13
528528
mpi: 'msmpi'
529529
- os: ubuntu-20.04
530530
mpi: 'msmpi'

‎src/phast/PhreeqcRM/.github/workflows/wheels.yml

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
name: wheels
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
paths-ignore:
7+
- '.github/workflows/ci.yml'
8+
- '.github/workflows/dist.yml'
9+
- '.gitignore'
10+
- 'build-all-presets.sh'
11+
- 'CMakePresets.json'
12+
push:
13+
# branches:
14+
# - master
15+
paths-ignore:
16+
- '.github/workflows/ci.yml'
17+
- '.github/workflows/dist.yml'
18+
- '.gitignore'
19+
- 'build-all-presets.sh'
20+
- 'CMakePresets.json'
421

522
jobs:
623
build_wheels:

‎src/phast/PhreeqcRM/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
requires = [
33
"scikit-build-core",
4-
"swig==4.2.1",
4+
"swig",
55
"numpy"
66
]
77
build-backend = "scikit_build_core.build"

‎src/phast/PhreeqcRM/swig/numpy.i

+34-34
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ void free_cap(PyObject * cap)
19891989
%typemap(argout)
19901990
(DATA_TYPE ARGOUT_ARRAY1[ANY])
19911991
{
1992-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
1992+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
19931993
}
19941994

19951995
/* Typemap suite for (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1)
@@ -2018,7 +2018,7 @@ void free_cap(PyObject * cap)
20182018
%typemap(argout)
20192019
(DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1)
20202020
{
2021-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
2021+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
20222022
}
20232023

20242024
/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1)
@@ -2047,7 +2047,7 @@ void free_cap(PyObject * cap)
20472047
%typemap(argout)
20482048
(DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1)
20492049
{
2050-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
2050+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
20512051
}
20522052

20532053
/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY])
@@ -2065,7 +2065,7 @@ void free_cap(PyObject * cap)
20652065
%typemap(argout)
20662066
(DATA_TYPE ARGOUT_ARRAY2[ANY][ANY])
20672067
{
2068-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
2068+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
20692069
}
20702070

20712071
/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY])
@@ -2083,7 +2083,7 @@ void free_cap(PyObject * cap)
20832083
%typemap(argout)
20842084
(DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY])
20852085
{
2086-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
2086+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
20872087
}
20882088

20892089
/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY])
@@ -2101,7 +2101,7 @@ void free_cap(PyObject * cap)
21012101
%typemap(argout)
21022102
(DATA_TYPE ARGOUT_ARRAY4[ANY][ANY][ANY][ANY])
21032103
{
2104-
$result = SWIG_Python_AppendOutput($result,(PyObject*)array$argnum);
2104+
$result = SWIG_AppendOutput($result,(PyObject*)array$argnum);
21052105
}
21062106

21072107
/*****************************/
@@ -2126,7 +2126,7 @@ void free_cap(PyObject * cap)
21262126
PyArrayObject* array = (PyArrayObject*) obj;
21272127

21282128
if (!array) SWIG_fail;
2129-
$result = SWIG_Python_AppendOutput($result,obj);
2129+
$result = SWIG_AppendOutput($result,obj);
21302130
}
21312131

21322132
/* Typemap suite for (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1)
@@ -2147,7 +2147,7 @@ void free_cap(PyObject * cap)
21472147
PyArrayObject* array = (PyArrayObject*) obj;
21482148

21492149
if (!array) SWIG_fail;
2150-
$result = SWIG_Python_AppendOutput($result,obj);
2150+
$result = SWIG_AppendOutput($result,obj);
21512151
}
21522152

21532153
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2)
@@ -2169,7 +2169,7 @@ void free_cap(PyObject * cap)
21692169
PyArrayObject* array = (PyArrayObject*) obj;
21702170

21712171
if (!array) SWIG_fail;
2172-
$result = SWIG_Python_AppendOutput($result,obj);
2172+
$result = SWIG_AppendOutput($result,obj);
21732173
}
21742174

21752175
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2)
@@ -2191,7 +2191,7 @@ void free_cap(PyObject * cap)
21912191
PyArrayObject* array = (PyArrayObject*) obj;
21922192

21932193
if (!array) SWIG_fail;
2194-
$result = SWIG_Python_AppendOutput($result,obj);
2194+
$result = SWIG_AppendOutput($result,obj);
21952195
}
21962196

21972197
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2)
@@ -2213,7 +2213,7 @@ void free_cap(PyObject * cap)
22132213
PyArrayObject* array = (PyArrayObject*) obj;
22142214

22152215
if (!array || !require_fortran(array)) SWIG_fail;
2216-
$result = SWIG_Python_AppendOutput($result,obj);
2216+
$result = SWIG_AppendOutput($result,obj);
22172217
}
22182218

22192219
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2)
@@ -2235,7 +2235,7 @@ void free_cap(PyObject * cap)
22352235
PyArrayObject* array = (PyArrayObject*) obj;
22362236

22372237
if (!array || !require_fortran(array)) SWIG_fail;
2238-
$result = SWIG_Python_AppendOutput($result,obj);
2238+
$result = SWIG_AppendOutput($result,obj);
22392239
}
22402240

22412241
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2259,7 +2259,7 @@ void free_cap(PyObject * cap)
22592259
PyArrayObject* array = (PyArrayObject*) obj;
22602260

22612261
if (!array) SWIG_fail;
2262-
$result = SWIG_Python_AppendOutput($result,obj);
2262+
$result = SWIG_AppendOutput($result,obj);
22632263
}
22642264

22652265
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3,
@@ -2283,7 +2283,7 @@ void free_cap(PyObject * cap)
22832283
PyArrayObject* array = (PyArrayObject*) obj;
22842284

22852285
if (!array) SWIG_fail;
2286-
$result = SWIG_Python_AppendOutput($result,obj);
2286+
$result = SWIG_AppendOutput($result,obj);
22872287
}
22882288

22892289
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2307,7 +2307,7 @@ void free_cap(PyObject * cap)
23072307
PyArrayObject* array = (PyArrayObject*) obj;
23082308

23092309
if (!array || !require_fortran(array)) SWIG_fail;
2310-
$result = SWIG_Python_AppendOutput($result,obj);
2310+
$result = SWIG_AppendOutput($result,obj);
23112311
}
23122312

23132313
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3,
@@ -2331,7 +2331,7 @@ void free_cap(PyObject * cap)
23312331
PyArrayObject* array = (PyArrayObject*) obj;
23322332

23332333
if (!array || !require_fortran(array)) SWIG_fail;
2334-
$result = SWIG_Python_AppendOutput($result,obj);
2334+
$result = SWIG_AppendOutput($result,obj);
23352335
}
23362336

23372337
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2356,7 +2356,7 @@ void free_cap(PyObject * cap)
23562356
PyArrayObject* array = (PyArrayObject*) obj;
23572357

23582358
if (!array) SWIG_fail;
2359-
$result = SWIG_Python_AppendOutput($result,obj);
2359+
$result = SWIG_AppendOutput($result,obj);
23602360
}
23612361

23622362
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4,
@@ -2381,7 +2381,7 @@ void free_cap(PyObject * cap)
23812381
PyArrayObject* array = (PyArrayObject*) obj;
23822382

23832383
if (!array) SWIG_fail;
2384-
$result = SWIG_Python_AppendOutput($result,obj);
2384+
$result = SWIG_AppendOutput($result,obj);
23852385
}
23862386

23872387
/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2406,7 +2406,7 @@ void free_cap(PyObject * cap)
24062406
PyArrayObject* array = (PyArrayObject*) obj;
24072407

24082408
if (!array || !require_fortran(array)) SWIG_fail;
2409-
$result = SWIG_Python_AppendOutput($result,obj);
2409+
$result = SWIG_AppendOutput($result,obj);
24102410
}
24112411

24122412
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4,
@@ -2431,7 +2431,7 @@ void free_cap(PyObject * cap)
24312431
PyArrayObject* array = (PyArrayObject*) obj;
24322432

24332433
if (!array || !require_fortran(array)) SWIG_fail;
2434-
$result = SWIG_Python_AppendOutput($result,obj);
2434+
$result = SWIG_AppendOutput($result,obj);
24352435
}
24362436

24372437
/*************************************/
@@ -2465,7 +2465,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
24652465
PyArray_SetBaseObject(array,cap);
24662466
%#endif
24672467

2468-
$result = SWIG_Python_AppendOutput($result,obj);
2468+
$result = SWIG_AppendOutput($result,obj);
24692469
}
24702470

24712471
/* Typemap suite for (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEWM_ARRAY1)
@@ -2495,7 +2495,7 @@ PyObject* cap = PyCapsule_New((void*)(*$2), SWIGPY_CAPSULE_NAME, free_cap);
24952495
PyArray_SetBaseObject(array,cap);
24962496
%#endif
24972497

2498-
$result = SWIG_Python_AppendOutput($result,obj);
2498+
$result = SWIG_AppendOutput($result,obj);
24992499
}
25002500

25012501
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2)
@@ -2526,7 +2526,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
25262526
PyArray_SetBaseObject(array,cap);
25272527
%#endif
25282528

2529-
$result = SWIG_Python_AppendOutput($result,obj);
2529+
$result = SWIG_AppendOutput($result,obj);
25302530
}
25312531

25322532
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_ARRAY2)
@@ -2557,7 +2557,7 @@ PyObject* cap = PyCapsule_New((void*)(*$3), SWIGPY_CAPSULE_NAME, free_cap);
25572557
PyArray_SetBaseObject(array,cap);
25582558
%#endif
25592559

2560-
$result = SWIG_Python_AppendOutput($result,obj);
2560+
$result = SWIG_AppendOutput($result,obj);
25612561
}
25622562

25632563
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2)
@@ -2588,7 +2588,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
25882588
PyArray_SetBaseObject(array,cap);
25892589
%#endif
25902590

2591-
$result = SWIG_Python_AppendOutput($result,obj);
2591+
$result = SWIG_AppendOutput($result,obj);
25922592
}
25932593

25942594
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEWM_FARRAY2)
@@ -2619,7 +2619,7 @@ PyObject* cap = PyCapsule_New((void*)(*$3), SWIGPY_CAPSULE_NAME, free_cap);
26192619
PyArray_SetBaseObject(array,cap);
26202620
%#endif
26212621

2622-
$result = SWIG_Python_AppendOutput($result,obj);
2622+
$result = SWIG_AppendOutput($result,obj);
26232623
}
26242624

26252625
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2652,7 +2652,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
26522652
PyArray_SetBaseObject(array,cap);
26532653
%#endif
26542654

2655-
$result = SWIG_Python_AppendOutput($result,obj);
2655+
$result = SWIG_AppendOutput($result,obj);
26562656
}
26572657

26582658
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3,
@@ -2685,7 +2685,7 @@ PyObject* cap = PyCapsule_New((void*)(*$4), SWIGPY_CAPSULE_NAME, free_cap);
26852685
PyArray_SetBaseObject(array,cap);
26862686
%#endif
26872687

2688-
$result = SWIG_Python_AppendOutput($result,obj);
2688+
$result = SWIG_AppendOutput($result,obj);
26892689
}
26902690

26912691
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2718,7 +2718,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
27182718
PyArray_SetBaseObject(array,cap);
27192719
%#endif
27202720

2721-
$result = SWIG_Python_AppendOutput($result,obj);
2721+
$result = SWIG_AppendOutput($result,obj);
27222722
}
27232723

27242724
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3,
@@ -2751,7 +2751,7 @@ PyObject* cap = PyCapsule_New((void*)(*$4), SWIGPY_CAPSULE_NAME, free_cap);
27512751
PyArray_SetBaseObject(array,cap);
27522752
%#endif
27532753

2754-
$result = SWIG_Python_AppendOutput($result,obj);
2754+
$result = SWIG_AppendOutput($result,obj);
27552755
}
27562756

27572757
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_ARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2785,7 +2785,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
27852785
PyArray_SetBaseObject(array,cap);
27862786
%#endif
27872787

2788-
$result = SWIG_Python_AppendOutput($result,obj);
2788+
$result = SWIG_AppendOutput($result,obj);
27892789
}
27902790

27912791
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4,
@@ -2819,7 +2819,7 @@ PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
28192819
PyArray_SetBaseObject(array,cap);
28202820
%#endif
28212821

2822-
$result = SWIG_Python_AppendOutput($result,obj);
2822+
$result = SWIG_AppendOutput($result,obj);
28232823
}
28242824

28252825
/* Typemap suite for (DATA_TYPE** ARGOUTVIEWM_FARRAY4, DIM_TYPE* DIM1, DIM_TYPE* DIM2,
@@ -2853,7 +2853,7 @@ PyObject* cap = PyCapsule_New((void*)(*$1), SWIGPY_CAPSULE_NAME, free_cap);
28532853
PyArray_SetBaseObject(array,cap);
28542854
%#endif
28552855

2856-
$result = SWIG_Python_AppendOutput($result,obj);
2856+
$result = SWIG_AppendOutput($result,obj);
28572857
}
28582858

28592859
/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DIM_TYPE* DIM4,
@@ -2887,7 +2887,7 @@ PyObject* cap = PyCapsule_New((void*)(*$5), SWIGPY_CAPSULE_NAME, free_cap);
28872887
PyArray_SetBaseObject(array,cap);
28882888
%#endif
28892889

2890-
$result = SWIG_Python_AppendOutput($result,obj);
2890+
$result = SWIG_AppendOutput($result,obj);
28912891
}
28922892

28932893
/**************************************/

0 commit comments

Comments
 (0)