Merge branch 'QPR-13327' into 'master'

Resolve QPR-13327

Closes QPR-13327

See merge request qs/ore-github!64

Author: pcaspers

.github/workflows/build_macosx86.yml

@@ -21,6 +21,9 @@ jobs:
         cd boost_1_84_0
         ./bootstrap.sh
         ./b2 toolset=clang-darwin target-os=darwin architecture=x86 cxxflags="-arch x86_64" cflags="-arch x86_64" linkflags="-arch x86_64" abi=sysv binary-format=mach-o install
+    - name: Install Swig
+      run: |
+        brew install swig
     - name: Build ORE CMake
       run: |
         mkdir build
@@ -32,7 +35,8 @@ jobs:
       run: |
         pwd
         python -m pip install setuptools
-        cp ORE-SWIG/wheels/oreanalytics-config.macos ORE-SWIG/oreanalytics-config
+        cp ORE-SWIG/Wheels/oreanalytics-config.macos ORE-SWIG/oreanalytics-config
+        chmod +x ORE-SWIG/oreanalytics-config
         cd ORE-SWIG/OREAnalytics-SWIG/SWIG
         chmod +x oreanalytics.i
         cd ..
@@ -42,10 +46,10 @@ jobs:
     - name: Build Wheels
       uses: pypa/cibuildwheel@v2.22.0
       env:
-        CIBW_SKIP: cp36-*
+        CIBW_SKIP: cp36-* pp*
         CIBW_ARCHS_MACOS: x86_64
         MACOSX_DEPLOYMENT_TARGET: "13.7"
-        CXXFLAGS: -std=c++17 -g0 -O3 -mmacosx-version-min=13
+        CXXFLAGS: -std=c++17 -g0 -O3 -mmacosx-version-min=13.7
         CIBW_BUILD_VERBOSITY: 2
         CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
           DYLD_LIBRARY_PATH=/usr/local/lib delocate-listdeps {wheel} &&

.github/workflows/build_windows.yaml

@@ -72,9 +72,8 @@ jobs:
         SET Eigen3_DIR=C:\local\eigen-3.4.0
         mkdir build
         cd build
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} -vcvars_ver=14.2 || exit 1
-        cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -DORE_BUILD_SWIG=false -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlib.lib -DBOOST_INCLUDEDIR=C:\local\boost -DBOOST_LIBRARYDIR=C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3 -L
-        cmake --build . -j 2 --verbose
+        cmake -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=false -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1 -G "Visual Studio 17 2022" -A ${{ matrix.platform }} ..
+        cmake --build . --config Release --verbose
     - name: Wrap ORE-SWIG for Python Wheels
       run: |
         SET BOOST=C:\local\boost

.github/workflows/linux_manylinux_wheels_01.yml

@@ -41,12 +41,13 @@ jobs:
       run: |
          pwd
          cp ORE-SWIG/Wheels/oreanalytics-config.linux ORE-SWIG/oreanalytics-config
+         chmod +x ORE-SWIG/oreanalytics-config
          cd ORE-SWIG/Wheels
          chmod +x before_all_linux.sh
     - name: Build ORE wheels
       uses: pypa/cibuildwheel@v2.22.0
       env:
-        CIBW_BUILD: "*-manylinux*"
+        CIBW_BUILD: "*-manylinux_x86_64"
         CIBW_SKIP: cp*
         #CIBW_BUILD: cp37-manylinux_x86_64
         #CIBW_BUILD: cp38-manylinux_x86_64

.github/workflows/linux_manylinux_wheels_02.yml

@@ -47,12 +47,13 @@ jobs:
       run: |
          pwd
          cp ORE-SWIG/Wheels/oreanalytics-config.linux ORE-SWIG/oreanalytics-config
+         chmod +x ORE-SWIG/oreanalytics-config
          cd ORE-SWIG/Wheels
          chmod +x before_all_linux.sh
     - name: Build ORE wheels
       uses: pypa/cibuildwheel@v2.22.0
       env:
-        #CIBW_BUILD: "*-manylinux*"
+        CIBW_BUILD: "*-manylinux_x86_64"
         CIBW_SKIP: cp36-* pp*
         #CIBW_BUILD: cp39-manylinux_x86_64 cp310-manylinux_x86_64 cp311-manylinux_x86_64
         #CIBW_BUILD: cp37-manylinux_x86_64

.github/workflows/macos_ARM64_build.yaml

@@ -24,24 +24,28 @@ jobs:
         cd boost_1_84_0
         sudo ./bootstrap.sh
         sudo ./b2 architecture=arm address-model=64 -s NO_LZMA=1 -s NO_ZSTD=1 abi=aapcs install
+    - name: Install Swig
+      run: |
+        sudo brew install swig
     - name: cmake configure and build
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
-        cmake --build . -j4
-        cmake --install .
+        sudo cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
+        sudo cmake --build . -j4
+        sudo cmake --install .
     - name: Wrap ORE-SWIG for Python Wheels
       run: |
         pwd
         cd ORE-SWIG
-        python -m pip install setuptools
-        cp ORE-SWIG/wheels/oreanalytics-config.macos ORE-SWIG/oreanalytics-config
-        cd ORE-SWIG/OREAnalytics-SWIG
+        sudo python -m pip install setuptools
+        cp Wheels/oreanalytics-config.macos oreanalytics-config
+        chmod +x oreanalytics-config
+        cd OREAnalytics-SWIG
         ls -al
         cd SWIG
         ls -al
-        chmod +x oreanalytics.i
+        sudo chmod +x oreanalytics.i
         cd ..
         cd ..
         ls -al

ORE-SWIG/Wheels/README.md

@@ -1,16 +1,14 @@
 # ore-wheels
 
 |   | macOS Intel | macOS Apple Silicon | Windows 64bit | manylinux x86_64 |
-|----------------|----|-----|-----|-----|----|
+|----------------|----|-----|-----|-----|
 | CPython 3.7    | ✅ | N/A | N/A  | ✅ |
 | CPython 3.8    | ✅ | ✅  |✅  |  ✅ | 
 | CPython 3.9    | ✅ | ✅  | ✅  |  ✅ | 
 | CPython 3.10   | ✅ | ✅  | ✅   |  ✅ | 
 | CPython 3.11   | ✅ | ✅  |✅  |  ✅ | 
 | CPython 3.12   | ✅ | ✅  | ✅   | ✅ |  
-| PyPy 3.7 v7.3  | ✅ | N/A | ✅  |  N/A | 
-| PyPy 3.8 v7.3  | ✅ | N/A | ✅  | N/A | 
-| PyPy 3.9 v7.3  | ✅ | N/A | ✅  | N/A | 
-| PyPy 3.10 v7.3 | ✅ | N/A | ✅  | N/A | 
-
-<sup>¹ PyPy is only supported for manylinux wheels, not musllinux.</sup><br>
+| PyPy 3.7 v7.3  | N/A | N/A | ✅  |  N/A | 
+| PyPy 3.8 v7.3  | N/A | N/A | ✅  | N/A | 
+| PyPy 3.9 v7.3  | N/A | N/A | ✅  | N/A | 
+| PyPy 3.10 v7.3 | N/A | N/A | ✅  | N/A | 

ORE-SWIG/Wheels/before_all_linux.sh

@@ -44,7 +44,6 @@ echo "XYZ END unpack boost"
 echo "XYZ BEGIN build ORE"
 pwd
 ls
-cd ORE
 mkdir build
 cd build
 cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DORE_USE_ZLIB=ON -DORE_BUILD_SWIG=OFF -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
@@ -56,6 +55,6 @@ echo "XYZ END build ORE"
 echo "XYZ BEGIN wrap oreswig"
 pwd
 ls
-cd ORE/ORE-SWIG
+cd ORE-SWIG
 python setup.py wrap
 

ORE-SWIG/setup.py

@@ -208,9 +208,9 @@ def finalize_options(self):
 
         elif compiler == 'unix':
             ql_compile_args = \
-                os.popen('../oreanalytics-config --cflags').read()[:-1].split()
+                os.popen('./oreanalytics-config --cflags').read()[:-1].split()
             ql_link_args = \
-                os.popen('../oreanalytics-config --libs').read()[:-1].split()
+                os.popen('./oreanalytics-config --libs').read()[:-1].split()
 
             self.define += [ (arg[2:],None) for arg in ql_compile_args
                              if arg.startswith('-D') ]