Merge branch 'QPR-13336' into 'master'

Merge branch 'QPR-13336' into 'master'

Closes QPR-13336

See merge request qs/ore-github!67

Author: farahkhashman

.github/workflows/build_macosx86.yml

@@ -28,7 +28,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64 -DORE_USE_ZLIB=OFF -DBUILD_SHARED_LIBS=false -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DORE_BUILD_SWIG=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
+        cmake .. -DCMAKE_OSX_ARCHITECTURES=x86_64 -DORE_USE_ZLIB=ON -DBUILD_SHARED_LIBS=false -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DORE_BUILD_SWIG=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
         cmake --build . -j4
         cmake --install .
     - name: Wrap ORE-SWIG

.github/workflows/build_windows.yaml

@@ -35,6 +35,16 @@ jobs:
       run: |
         swig -version
         swig -help
+    - name: zlib
+      run: |
+        $Url = "https://www.zlib.net/zlib131.zip"
+        (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\zlib.zip")
+        Expand-Archive -Path "$env:TEMP\zlib.zip" -DestinationPath C:\local
+        cd C:\local\zlib-1.3.1
+        mkdir build
+        cd build
+        cmake ..
+        cmake --build . --config Release
     - name: eigen
       run: |
         $Url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.zip"
@@ -57,10 +67,12 @@ jobs:
       run: |
         SET ORE_DIR=%cd%
         SET ORE=%cd%
+        SET ZLIB_ROOT=C:\local\zlib-1.3.1
+        SET ZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1
         SET Eigen3_DIR=C:\local\eigen-3.4.0
         mkdir build
         cd build
-        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=OFF -DQL_ENABLE_SESSIONS=ON -G "Visual Studio 17 2022" -A ${{ matrix.platform }} ..
+        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: |
@@ -81,6 +93,7 @@ jobs:
         ORE: ${{ github.workspace }}
         ORE_DIR: ${{ github.workspace }}
         ORE_STATIC_RUNTIME: 1
+        ORE_USE_ZLIB: 1
         CIBW_SKIP: cp36-*
         #CIBW_BUILD: cp37-win_amd64
         #CIBW_BUILD: cp38-win32

.github/workflows/linux_build.yaml

@@ -14,6 +14,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+    #    token: ${{ secrets.ORG_ACTIONS_ACCESS }} 
+    #- name: get QuantLib
+    #  run: |
+    #    git submodule update --init --recursive
     - name: Set up Boost
       run: |
         sudo apt update

.github/workflows/linux_manylinux_wheels_01.yml

@@ -28,6 +28,15 @@ jobs:
         cmake ..
         export 
         export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
+    - name: Build Zlib
+      run: |
+        pwd
+        curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
+        tar xzvf zlib-1.3.1.tar.gz
+        cd zlib-1.3.1
+        ./configure
+        make
+        export ZLIB_ROOT=$CURRENT_DIR/zlib-1.3.1
     - name: Copy Configuration
       run: |
          pwd

.github/workflows/linux_manylinux_wheels_02.yml

@@ -28,6 +28,21 @@ jobs:
         cmake ..
         export 
         export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
+    - name: Build Zlib
+      run: |
+        pwd
+        curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
+        tar xzvf zlib-1.3.1.tar.gz
+        cd zlib-1.3.1
+        ./configure
+        make
+        export ZLIB_ROOT=$CURRENT_DIR/zlib-1.3.1
+#   - name: Build ORE
+#     run : pwd; cd ORE; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DORE_USE_ZLIB=ON -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -G "Ninja" ..
+#    - name: cmake build
+#      run: pwd; cd ORE; cd build; cmake --build . -j $(nproc)
+#    - name: Wrap ORE-SWIG
+#      run: pwd; cd OREAnalytics-SWIG/Python; python setup.py wrap
     - name: Copy Configuration
       run: |
          pwd

.github/workflows/macos_ARM64_build.yaml

@@ -13,6 +13,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+    #    token: ${{ secrets.ORG_ACTIONS_ACCESS }}  
+    #- name: get QuantLib
+    #  run: |
+    #    git submodule update --init --recursive
     - name: Install Boost
       run: |
         curl -O -L https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.gz
@@ -27,7 +31,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        sudo cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=OFF -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 .. -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

ORE-SWIG/Wheels/before_all_linux.sh

@@ -11,14 +11,33 @@ echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
 
 CURRENT_DIR=$(pwd)
 
+#echo "XYZ BEGIN unpack eigen"
+#curl -O -L https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz
+#tar zxvf eigen-3.4.0.tar.gz
+#cd eigen-3.4.0
+#mkdir build
+#cd build
+#cmake ..
+#cd ../..
+#echo "XYZ END unpack eigen"
+
+#echo "XYZ BEGIN unpack zlib"
+#curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
+#tar xzvf zlib-1.3.1.tar.gz
+#cd zlib-1.3.1
+#./configure
+#make
+#cd ..
+#echo "XYZ END unpack zlib"
+
 echo "XYZ BEGIN unpack boost"
 # Setup Boost
 curl -O -L https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz
 tar xfz boost_1_80_0.tar.gz
 cd boost_1_80_0
 export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
 ./bootstrap.sh --with-libraries=date_time,filesystem,iostreams,log,regex,serialization,system,thread,timer
-./b2 install
+./b2 install -sZLIB_SOURCE=$CURRENT_DIR/zlib-1.3.1
 cd ..
 echo "XYZ END unpack boost"
 
@@ -27,7 +46,7 @@ pwd
 ls
 mkdir build
 cd build
-cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DORE_USE_ZLIB=OFF -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 ..
+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 ..
 cmake --build . -j4
 cmake --install .
 cd ..