From c8aae5b941fb81c37fbfcda01b0f4ed126f50982 Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Wed, 3 Apr 2024 11:20:29 +0200 Subject: [PATCH 1/3] Position independent code --- .github/workflows/scripts/macos_arm.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/macos_arm.bash b/.github/workflows/scripts/macos_arm.bash index 5215ba3..2f1c65d 100644 --- a/.github/workflows/scripts/macos_arm.bash +++ b/.github/workflows/scripts/macos_arm.bash @@ -58,7 +58,7 @@ unzip release-$SOPLEX_VERSION.zip cd soplex-release-$SOPLEX_VERSION mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DGMP=true -DPAPILO=false -DBOOST=false -DGMP_DIR=../../scip_install -DWITH_SHARED_LIBS=off +cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DGMP=true -DPAPILO=false -DBOOST=false -DGMP_DIR=../../scip_install -DWITH_SHARED_LIBS=off -DPOSITION_INDEPENDENT_CODE=ON make -j$(nproc) make test make install @@ -72,7 +72,7 @@ cd build cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install make -j$(nproc) make install -cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install -DSHARED=false +cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install -DSHARED=false -DPOSITION_INDEPENDENT_CODE=ON make -j$(nproc) make install From f221c48b164b424c916fac204b8bcf848ef3b8cb Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Wed, 3 Apr 2024 11:25:20 +0200 Subject: [PATCH 2/3] Disable windows and ubuntu for now --- .github/workflows/build_binaries.yml | 64 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build_binaries.yml b/.github/workflows/build_binaries.yml index a5ed437..cc31c10 100644 --- a/.github/workflows/build_binaries.yml +++ b/.github/workflows/build_binaries.yml @@ -38,9 +38,9 @@ jobs: - os: macos-14 bash_script: macos_arm.bash id: macos-arm - - os: macos-latest - bash_script: macos.bash - id: macos + # - os: macos-latest + # bash_script: macos.bash + # id: macos runs-on: ${{ matrix.os }} steps: @@ -56,36 +56,36 @@ jobs: with: path: ${{ github.workspace }}/libscip-${{matrix.id}}.zip - linux-build-binaries: - runs-on: ubuntu-latest - container: quay.io/pypa/manylinux2014_x86_64 - steps: - - uses: actions/checkout@v3 - - name: Build and install SCIP - run: | - export SCIP_VERSION=$(echo "${{github.event.inputs.scip_version}}" | tr -d '.') - export SOPLEX_VERSION=$(echo "${{github.event.inputs.soplex_version}}" | tr -d '.') - export IPOPT_VERSION=${{ github.event.inputs.ipopt_version }} - bash -x .github/workflows/scripts/linux.bash - - uses: actions/upload-artifact@v3 - with: - path: ${{ github.workspace }}/libscip-linux.zip + # linux-build-binaries: + # runs-on: ubuntu-latest + # container: quay.io/pypa/manylinux2014_x86_64 + # steps: + # - uses: actions/checkout@v3 + # - name: Build and install SCIP + # run: | + # export SCIP_VERSION=$(echo "${{github.event.inputs.scip_version}}" | tr -d '.') + # export SOPLEX_VERSION=$(echo "${{github.event.inputs.soplex_version}}" | tr -d '.') + # export IPOPT_VERSION=${{ github.event.inputs.ipopt_version }} + # bash -x .github/workflows/scripts/linux.bash + # - uses: actions/upload-artifact@v3 + # with: + # path: ${{ github.workspace }}/libscip-linux.zip - windows-build-binaries: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - uses: msys2/setup-msys2@v2 + # windows-build-binaries: + # runs-on: windows-latest + # steps: + # - uses: actions/checkout@v3 + # - uses: msys2/setup-msys2@v2 - - name: Build and install SCIP - run: | - export SCIP_VERSION=$(echo "${{github.event.inputs.scip_version}}" | tr -d '.') - export SOPLEX_VERSION=$(echo "${{github.event.inputs.soplex_version}}" | tr -d '.') - export IPOPT_VERSION=${{ github.event.inputs.ipopt_version }} - bash -x .github/workflows/scripts/windows.bash - shell: msys2 {0} + # - name: Build and install SCIP + # run: | + # export SCIP_VERSION=$(echo "${{github.event.inputs.scip_version}}" | tr -d '.') + # export SOPLEX_VERSION=$(echo "${{github.event.inputs.soplex_version}}" | tr -d '.') + # export IPOPT_VERSION=${{ github.event.inputs.ipopt_version }} + # bash -x .github/workflows/scripts/windows.bash + # shell: msys2 {0} - - uses: actions/upload-artifact@v3 - with: - path: ${{ github.workspace }}/libscip-windows.zip + # - uses: actions/upload-artifact@v3 + # with: + # path: ${{ github.workspace }}/libscip-windows.zip From deffe0eaf03741f9236867c867de5785c509c46c Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Wed, 3 Apr 2024 15:15:46 +0200 Subject: [PATCH 3/3] Compile with nauty and link libsoplex-pic.a --- .github/workflows/scripts/macos_arm.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/scripts/macos_arm.bash b/.github/workflows/scripts/macos_arm.bash index 2f1c65d..8b12223 100644 --- a/.github/workflows/scripts/macos_arm.bash +++ b/.github/workflows/scripts/macos_arm.bash @@ -58,7 +58,7 @@ unzip release-$SOPLEX_VERSION.zip cd soplex-release-$SOPLEX_VERSION mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DGMP=true -DPAPILO=false -DBOOST=false -DGMP_DIR=../../scip_install -DWITH_SHARED_LIBS=off -DPOSITION_INDEPENDENT_CODE=ON +cmake .. -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/scip_install -DCMAKE_BUILD_TYPE=Release -DGMP=true -DPAPILO=false -DBOOST=false -DGMP_DIR=$GITHUB_WORKSPACE/scip_install -DWITH_SHARED_LIBS=off -DPOSITION_INDEPENDENT_CODE=ON make -j$(nproc) make test make install @@ -69,10 +69,10 @@ unzip v$SCIP_VERSION.zip cd scip-$SCIP_VERSION mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install -make -j$(nproc) -make install -cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install -DSHARED=false -DPOSITION_INDEPENDENT_CODE=ON +# cmake .. -DCMAKE_INSTALL_PREFIX=../../scip_install -DCMAKE_BUILD_TYPE=Release -DLPS=spx -DSOPLEX_DIR=../../scip_install -DGMP_DIR=../../scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=../../scip_install +# make -j$(nproc) +# make install +cmake .. -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/scip_install -DCMAKE_BUILD_TYPE=Release -DSYM=nauty -DLPS=spx -DSOPLEX_DIR=$GITHUB_WORKSPACE/scip_install/lib/libsoplex-pic.a -DGMP_DIR=$GITHUB_WORKSPACE/scip_install -DPAPILO=false -DZIMPL=false -DGMP=true -DREADLINE=false -DIPOPT=true -DIPOPT_DIR=$GITHUB_WORKSPACE/scip_install -DSHARED=false -DPOSITION_INDEPENDENT_CODE=ON -DZLIB=Off make -j$(nproc) make install