Skip to content

Commit 1465cb6

Browse files
farahkhashmanfarahkhashman
committed
Merge branch 'QPR-13336' into 'master'
QPR-13336: w/o zlib in workflows Closes QPR-13336 See merge request qs/ore-github!66
2 parents fea8cb1 + 0e98a5f commit 1465cb6

8 files changed

Lines changed: 8 additions & 70 deletions

File tree

‎.github/workflows/build_macosx86.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
mkdir build
3030
cd build
31-
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 ..
31+
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 ..
3232
cmake --build . -j4
3333
cmake --install .
3434
- name: Wrap ORE-SWIG

‎.github/workflows/build_windows.yaml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@ jobs:
3535
run: |
3636
swig -version
3737
swig -help
38-
- name: zlib
39-
run: |
40-
$Url = "https://www.zlib.net/zlib131.zip"
41-
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\zlib.zip")
42-
Expand-Archive -Path "$env:TEMP\zlib.zip" -DestinationPath C:\local
43-
cd C:\local\zlib-1.3.1
44-
mkdir build
45-
cd build
46-
cmake ..
47-
cmake --build . --config Release
4838
- name: eigen
4939
run: |
5040
$Url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.zip"
@@ -67,12 +57,10 @@ jobs:
6757
run: |
6858
SET ORE_DIR=%cd%
6959
SET ORE=%cd%
70-
SET ZLIB_ROOT=C:\local\zlib-1.3.1
71-
SET ZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1
7260
SET Eigen3_DIR=C:\local\eigen-3.4.0
7361
mkdir build
7462
cd build
75-
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 }} ..
63+
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 }} ..
7664
cmake --build . --config Release --verbose
7765
- name: Wrap ORE-SWIG for Python Wheels
7866
run: |
@@ -93,7 +81,6 @@ jobs:
9381
ORE: ${{ github.workspace }}
9482
ORE_DIR: ${{ github.workspace }}
9583
ORE_STATIC_RUNTIME: 1
96-
ORE_USE_ZLIB: 1
9784
CIBW_SKIP: cp36-*
9885
#CIBW_BUILD: cp37-win_amd64
9986
#CIBW_BUILD: cp38-win32

‎.github/workflows/linux_build.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
submodules: recursive
17-
# token: ${{ secrets.ORG_ACTIONS_ACCESS }}
18-
#- name: get QuantLib
19-
# run: |
20-
# git submodule update --init --recursive
2117
- name: Set up Boost
2218
run: |
2319
sudo apt update

‎.github/workflows/linux_manylinux_wheels_01.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ jobs:
2828
cmake ..
2929
export
3030
export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
31-
- name: Build Zlib
32-
run: |
33-
pwd
34-
curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
35-
tar xzvf zlib-1.3.1.tar.gz
36-
cd zlib-1.3.1
37-
./configure
38-
make
39-
export ZLIB_ROOT=$CURRENT_DIR/zlib-1.3.1
4031
- name: Copy Configuration
4132
run: |
4233
pwd

‎.github/workflows/linux_manylinux_wheels_02.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,6 @@ jobs:
2828
cmake ..
2929
export
3030
export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
31-
- name: Build Zlib
32-
run: |
33-
pwd
34-
curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
35-
tar xzvf zlib-1.3.1.tar.gz
36-
cd zlib-1.3.1
37-
./configure
38-
make
39-
export ZLIB_ROOT=$CURRENT_DIR/zlib-1.3.1
40-
# - name: Build ORE
41-
# 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" ..
42-
# - name: cmake build
43-
# run: pwd; cd ORE; cd build; cmake --build . -j $(nproc)
44-
# - name: Wrap ORE-SWIG
45-
# run: pwd; cd OREAnalytics-SWIG/Python; python setup.py wrap
4631
- name: Copy Configuration
4732
run: |
4833
pwd

‎.github/workflows/macos_ARM64_build.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
- uses: actions/checkout@v4
1414
with:
1515
submodules: recursive
16-
# token: ${{ secrets.ORG_ACTIONS_ACCESS }}
17-
#- name: get QuantLib
18-
# run: |
19-
# git submodule update --init --recursive
2016
- name: Install Boost
2117
run: |
2218
curl -O -L https://archives.boost.io/release/1.84.0/source/boost_1_84_0.tar.gz
@@ -26,12 +22,12 @@ jobs:
2622
sudo ./b2 architecture=arm address-model=64 -s NO_LZMA=1 -s NO_ZSTD=1 abi=aapcs install
2723
- name: Install Swig
2824
run: |
29-
sudo brew install swig
25+
brew install swig
3026
- name: cmake configure and build
3127
run: |
3228
mkdir build
3329
cd build
34-
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 ..
30+
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 ..
3531
sudo cmake --build . -j4
3632
sudo cmake --install .
3733
- name: Wrap ORE-SWIG for Python Wheels

‎ORE-SWIG/Wheels/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
| CPython 3.10 | ✅ | ✅ | ✅ | ✅ |
99
| CPython 3.11 | ✅ | ✅ |✅ | ✅ |
1010
| CPython 3.12 | ✅ | ✅ | ✅ | ✅ |
11+
| CPython 3.13 | ✅ | ✅ | ✅ | ✅ |
1112
| PyPy 3.7 v7.3 | N/A | N/A | ✅ | N/A |
1213
| PyPy 3.8 v7.3 | N/A | N/A | ✅ | N/A |
1314
| PyPy 3.9 v7.3 | N/A | N/A | ✅ | N/A |
1415
| PyPy 3.10 v7.3 | N/A | N/A | ✅ | N/A |
16+
| PyPy 3.11 v7.3 | N/A | N/A | ✅ | N/A |

‎ORE-SWIG/Wheels/before_all_linux.sh‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,14 @@ echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
1111

1212
CURRENT_DIR=$(pwd)
1313

14-
#echo "XYZ BEGIN unpack eigen"
15-
#curl -O -L https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz
16-
#tar zxvf eigen-3.4.0.tar.gz
17-
#cd eigen-3.4.0
18-
#mkdir build
19-
#cd build
20-
#cmake ..
21-
#cd ../..
22-
#echo "XYZ END unpack eigen"
23-
24-
#echo "XYZ BEGIN unpack zlib"
25-
#curl -O -L https://www.zlib.net/zlib-1.3.1.tar.gz
26-
#tar xzvf zlib-1.3.1.tar.gz
27-
#cd zlib-1.3.1
28-
#./configure
29-
#make
30-
#cd ..
31-
#echo "XYZ END unpack zlib"
32-
3314
echo "XYZ BEGIN unpack boost"
3415
# Setup Boost
3516
curl -O -L https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz
3617
tar xfz boost_1_80_0.tar.gz
3718
cd boost_1_80_0
3819
export Eigen3_DIR=$CURRENT_DIR/eigen-3.4.0
3920
./bootstrap.sh --with-libraries=date_time,filesystem,iostreams,log,regex,serialization,system,thread,timer
40-
./b2 install -sZLIB_SOURCE=$CURRENT_DIR/zlib-1.3.1
21+
./b2 install
4122
cd ..
4223
echo "XYZ END unpack boost"
4324

@@ -46,7 +27,7 @@ pwd
4627
ls
4728
mkdir build
4829
cd build
49-
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 ..
30+
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 ..
5031
cmake --build . -j4
5132
cmake --install .
5233
cd ..

0 commit comments

Comments
 (0)