Skip to content

Commit ae9bd57

Browse files
langmmlangmm
authored
Merge pull request #99 from cropsinsilico/topic/cppseri_migration
Topic/cppseri migration
2 parents 70705bb + 67ed4a4 commit ae9bd57

File tree

70 files changed

+1955
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1955
-614
lines changed

‎.github/workflows/test-install.yml‎

Lines changed: 85 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,12 @@ jobs:
264264
265265
echo "TEMP=$USERPROFILE\\AppData\\Local\\Temp" >> $GITHUB_ENV
266266
267+
'
268+
shell: bash -l {0}
269+
- if: runner.os == 'Windows' && startsWith(matrix.test-flags1, '--suite=examples')
270+
name: (WINDOWS) Disable interpreted language example on Windows for speed
271+
run: 'echo "TEST_FLAGS1_SUFFIX=--skip-languages python R julia" >> $GITHUB_ENV
272+
267273
'
268274
shell: bash -l {0}
269275
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLC
@@ -309,11 +315,18 @@ jobs:
309315
restore-keys: '${{ runner.os }}-pip-
310316
311317
'
312-
- if: matrix.install-method == 'pip'
318+
- if: matrix.install-method == 'pip' && (matrix.python-version != 3.7 || runner.os
319+
!= 'macOS')
313320
name: (PIP) Set up Python
314321
uses: actions/setup-python@v4
315322
with:
316323
python-version: ${{ matrix.python-version }}
324+
- if: matrix.install-method == 'pip' && matrix.python-version == 3.7 && runner.os
325+
== 'macOS'
326+
name: (PIP) Set up Python 3.7
327+
uses: actions/setup-python@v4
328+
with:
329+
python-version: 3.7.16
317330
- if: matrix.install-method == 'pip' && env.INSTALLJULIA == 1
318331
name: (PIP) Set up Julia
319332
uses: julia-actions/setup-julia@v1
@@ -431,12 +444,13 @@ jobs:
431444
id: test1
432445
name: Run tests (1st)
433446
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
434-
}}
447+
}} ${{ env.TEST_FLAGS1_SUFFIX }}
435448
timeout-minutes: 120
436449
- if: ${{ steps.test1.outcome == 'failure' }}
437450
name: Re-run test failures (1st)
438451
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
439-
}} --last-failed --last-failed-no-failures=all --second-attempt
452+
}} ${{ env.TEST_FLAGS1_SUFFIX }} --last-failed --last-failed-no-failures=all
453+
--second-attempt
440454
timeout-minutes: 120
441455
- continue-on-error: true
442456
id: test1_script
@@ -597,6 +611,12 @@ jobs:
597611
598612
echo "TEMP=$USERPROFILE\\AppData\\Local\\Temp" >> $GITHUB_ENV
599613
614+
'
615+
shell: bash -l {0}
616+
- if: runner.os == 'Windows' && startsWith(matrix.test-flags1, '--suite=examples')
617+
name: (WINDOWS) Disable interpreted language example on Windows for speed
618+
run: 'echo "TEST_FLAGS1_SUFFIX=--skip-languages python R julia" >> $GITHUB_ENV
619+
600620
'
601621
shell: bash -l {0}
602622
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLC
@@ -642,11 +662,18 @@ jobs:
642662
restore-keys: '${{ runner.os }}-pip-
643663
644664
'
645-
- if: matrix.install-method == 'pip'
665+
- if: matrix.install-method == 'pip' && (matrix.python-version != 3.7 || runner.os
666+
!= 'macOS')
646667
name: (PIP) Set up Python
647668
uses: actions/setup-python@v4
648669
with:
649670
python-version: ${{ matrix.python-version }}
671+
- if: matrix.install-method == 'pip' && matrix.python-version == 3.7 && runner.os
672+
== 'macOS'
673+
name: (PIP) Set up Python 3.7
674+
uses: actions/setup-python@v4
675+
with:
676+
python-version: 3.7.16
650677
- if: matrix.install-method == 'pip' && env.INSTALLJULIA == 1
651678
name: (PIP) Set up Julia
652679
uses: julia-actions/setup-julia@v1
@@ -764,12 +791,13 @@ jobs:
764791
id: test1
765792
name: Run tests (1st)
766793
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
767-
}}
794+
}} ${{ env.TEST_FLAGS1_SUFFIX }}
768795
timeout-minutes: 120
769796
- if: ${{ steps.test1.outcome == 'failure' }}
770797
name: Re-run test failures (1st)
771798
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
772-
}} --last-failed --last-failed-no-failures=all --second-attempt
799+
}} ${{ env.TEST_FLAGS1_SUFFIX }} --last-failed --last-failed-no-failures=all
800+
--second-attempt
773801
timeout-minutes: 120
774802
- continue-on-error: true
775803
id: test1_script
@@ -922,6 +950,12 @@ jobs:
922950
923951
echo "TEMP=$USERPROFILE\\AppData\\Local\\Temp" >> $GITHUB_ENV
924952
953+
'
954+
shell: bash -l {0}
955+
- if: runner.os == 'Windows' && startsWith(matrix.test-flags1, '--suite=examples')
956+
name: (WINDOWS) Disable interpreted language example on Windows for speed
957+
run: 'echo "TEST_FLAGS1_SUFFIX=--skip-languages python R julia" >> $GITHUB_ENV
958+
925959
'
926960
shell: bash -l {0}
927961
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLC
@@ -967,11 +1001,18 @@ jobs:
9671001
restore-keys: '${{ runner.os }}-pip-
9681002
9691003
'
970-
- if: matrix.install-method == 'pip'
1004+
- if: matrix.install-method == 'pip' && (matrix.python-version != 3.7 || runner.os
1005+
!= 'macOS')
9711006
name: (PIP) Set up Python
9721007
uses: actions/setup-python@v4
9731008
with:
9741009
python-version: ${{ matrix.python-version }}
1010+
- if: matrix.install-method == 'pip' && matrix.python-version == 3.7 && runner.os
1011+
== 'macOS'
1012+
name: (PIP) Set up Python 3.7
1013+
uses: actions/setup-python@v4
1014+
with:
1015+
python-version: 3.7.16
9751016
- if: matrix.install-method == 'pip' && env.INSTALLJULIA == 1
9761017
name: (PIP) Set up Julia
9771018
uses: julia-actions/setup-julia@v1
@@ -1089,12 +1130,13 @@ jobs:
10891130
id: test1
10901131
name: Run tests (1st)
10911132
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1092-
}}
1133+
}} ${{ env.TEST_FLAGS1_SUFFIX }}
10931134
timeout-minutes: 120
10941135
- if: ${{ steps.test1.outcome == 'failure' }}
10951136
name: Re-run test failures (1st)
10961137
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1097-
}} --last-failed --last-failed-no-failures=all --second-attempt
1138+
}} ${{ env.TEST_FLAGS1_SUFFIX }} --last-failed --last-failed-no-failures=all
1139+
--second-attempt
10981140
timeout-minutes: 120
10991141
- continue-on-error: true
11001142
id: test1_script
@@ -1230,6 +1272,12 @@ jobs:
12301272
12311273
echo "TEMP=$USERPROFILE\\AppData\\Local\\Temp" >> $GITHUB_ENV
12321274
1275+
'
1276+
shell: bash -l {0}
1277+
- if: runner.os == 'Windows' && startsWith(matrix.test-flags1, '--suite=examples')
1278+
name: (WINDOWS) Disable interpreted language example on Windows for speed
1279+
run: 'echo "TEST_FLAGS1_SUFFIX=--skip-languages python R julia" >> $GITHUB_ENV
1280+
12331281
'
12341282
shell: bash -l {0}
12351283
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLC
@@ -1275,11 +1323,18 @@ jobs:
12751323
restore-keys: '${{ runner.os }}-pip-
12761324
12771325
'
1278-
- if: matrix.install-method == 'pip'
1326+
- if: matrix.install-method == 'pip' && (matrix.python-version != 3.7 || runner.os
1327+
!= 'macOS')
12791328
name: (PIP) Set up Python
12801329
uses: actions/setup-python@v4
12811330
with:
12821331
python-version: ${{ matrix.python-version }}
1332+
- if: matrix.install-method == 'pip' && matrix.python-version == 3.7 && runner.os
1333+
== 'macOS'
1334+
name: (PIP) Set up Python 3.7
1335+
uses: actions/setup-python@v4
1336+
with:
1337+
python-version: 3.7.16
12831338
- if: matrix.install-method == 'pip' && env.INSTALLJULIA == 1
12841339
name: (PIP) Set up Julia
12851340
uses: julia-actions/setup-julia@v1
@@ -1397,12 +1452,13 @@ jobs:
13971452
id: test1
13981453
name: Run tests (1st)
13991454
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1400-
}}
1455+
}} ${{ env.TEST_FLAGS1_SUFFIX }}
14011456
timeout-minutes: 120
14021457
- if: ${{ steps.test1.outcome == 'failure' }}
14031458
name: Re-run test failures (1st)
14041459
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1405-
}} --last-failed --last-failed-no-failures=all --second-attempt
1460+
}} ${{ env.TEST_FLAGS1_SUFFIX }} --last-failed --last-failed-no-failures=all
1461+
--second-attempt
14061462
timeout-minutes: 120
14071463
- continue-on-error: true
14081464
id: test1_script
@@ -1537,6 +1593,12 @@ jobs:
15371593
15381594
echo "TEMP=$USERPROFILE\\AppData\\Local\\Temp" >> $GITHUB_ENV
15391595
1596+
'
1597+
shell: bash -l {0}
1598+
- if: runner.os == 'Windows' && startsWith(matrix.test-flags1, '--suite=examples')
1599+
name: (WINDOWS) Disable interpreted language example on Windows for speed
1600+
run: 'echo "TEST_FLAGS1_SUFFIX=--skip-languages python R julia" >> $GITHUB_ENV
1601+
15401602
'
15411603
shell: bash -l {0}
15421604
- if: runner.os == 'Windows' && matrix.install-method == 'pip' && env.INSTALLC
@@ -1582,11 +1644,18 @@ jobs:
15821644
restore-keys: '${{ runner.os }}-pip-
15831645
15841646
'
1585-
- if: matrix.install-method == 'pip'
1647+
- if: matrix.install-method == 'pip' && (matrix.python-version != 3.7 || runner.os
1648+
!= 'macOS')
15861649
name: (PIP) Set up Python
15871650
uses: actions/setup-python@v4
15881651
with:
15891652
python-version: ${{ matrix.python-version }}
1653+
- if: matrix.install-method == 'pip' && matrix.python-version == 3.7 && runner.os
1654+
== 'macOS'
1655+
name: (PIP) Set up Python 3.7
1656+
uses: actions/setup-python@v4
1657+
with:
1658+
python-version: 3.7.16
15901659
- if: matrix.install-method == 'pip' && env.INSTALLJULIA == 1
15911660
name: (PIP) Set up Julia
15921661
uses: julia-actions/setup-julia@v1
@@ -1704,12 +1773,13 @@ jobs:
17041773
id: test1
17051774
name: Run tests (1st)
17061775
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1707-
}}
1776+
}} ${{ env.TEST_FLAGS1_SUFFIX }}
17081777
timeout-minutes: 120
17091778
- if: ${{ steps.test1.outcome == 'failure' }}
17101779
name: Re-run test failures (1st)
17111780
run: pytest --import-mode=importlib --ci --cov-append ${{ matrix.test-flags1
1712-
}} --last-failed --last-failed-no-failures=all --second-attempt
1781+
}} ${{ env.TEST_FLAGS1_SUFFIX }} --last-failed --last-failed-no-failures=all
1782+
--second-attempt
17131783
timeout-minutes: 120
17141784
- continue-on-error: true
17151785
id: test1_script

‎HISTORY.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
History
33
=======
44

5+
1.10.1 (2023-06-27) New map transformation, composite function wrapping example, and various refactoring of internal methods
6+
-------------------
7+
8+
* Added map transformation for converting arrays into map types
9+
* Added support for automatted wrapping of C++ model functions that have arguments with types of std::string, std::vector, or std::map.
10+
* Added composite_function example of wrapping multiple inputs of different types to a function as separate channels and composite_function2 example of wrapping multiple inputs & outputs to a function as single channels
11+
* Added 'count' FileComm parameter to specify the number of times a file should be read
12+
* Refactor geometry serialization classes to use rapidjson methods
13+
* Refactor how additional variables created during function wrapping are handled
14+
* Updated C++ interface to use updated rapidjson that requires allocators for yggdrasil types
15+
* Allow use of with_asan with CMake/Make models
16+
517
1.10.0 (2023-05-31) Added support for PyTorch models, sequence files, image files, and Excel files
618
-------------------
719

‎_vendor/python_rapidjson/CHANGES.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
Changes
22
-------
33

4+
1.10 (2023-03-15)
5+
~~~~~~~~~~~~~~~~~
6+
7+
* Use `current master`__ version of rapidjson
8+
9+
__ https://github.com/Tencent/rapidjson/commit/083f359f5c36198accc2b9360ce1e32a333231d9
10+
11+
* Produce ppc64le wheels, thanks to mgiessing (`PR #170`__)
12+
13+
__ https://github.com/python-rapidjson/python-rapidjson/pull/170
14+
15+
* Use cibuildwheel `2.21.1`__
16+
17+
__ https://cibuildwheel.readthedocs.io/en/stable/changelog/#v2121
18+
19+
420
1.9 (2022-10-17)
521
~~~~~~~~~~~~~~~~
622

0 commit comments

Comments
 (0)