From b131af835fbb1e4b7df38615d199b6e535c26b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Tue, 28 May 2024 16:41:21 +0200 Subject: [PATCH 01/14] Bump one CI config to ubuntu-24.04 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6993dd9e..33c2dceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: WITH_BFD: yes PYTHON_VERSION: '3.12' TEST_SYMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-24.04 CC: gcc - BUILD_TYPE: Debug From 02bd6d4a37ef62a9bd8588e100b040459f70b40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Tue, 28 May 2024 16:49:43 +0200 Subject: [PATCH 02/14] try to work around hardcoded versions in symengine's install_travis.sh --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33c2dceb..4a44aa8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: PYTHON_VERSION: '3.12' TEST_SYMPY: yes OS: ubuntu-24.04 - CC: gcc + CC: 'ccache gcc' # symengine's bin/install_travis.sh needs refactoring... - BUILD_TYPE: Debug WITH_BFD: yes From fdff48def4d936eb9f7935b3bfef35096aadd83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Tue, 28 May 2024 16:54:42 +0200 Subject: [PATCH 03/14] try another workaround --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a44aa8a..9cddcb2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: PYTHON_VERSION: '3.12' TEST_SYMPY: yes OS: ubuntu-24.04 - CC: 'ccache gcc' # symengine's bin/install_travis.sh needs refactoring... + CC: 'gcc -v' # symengine's bin/install_travis.sh needs refactoring... - BUILD_TYPE: Debug WITH_BFD: yes From 8a4f3b895050c6164ba5ee1ee19d7fa13238d1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Tue, 28 May 2024 16:58:18 +0200 Subject: [PATCH 04/14] also set CXX --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9cddcb2b..b4156101 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: TEST_SYMPY: yes OS: ubuntu-24.04 CC: 'gcc -v' # symengine's bin/install_travis.sh needs refactoring... + CXX: 'g++ -v' - BUILD_TYPE: Debug WITH_BFD: yes From de69b995e9116356823960253de046fee294f43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Fri, 31 May 2024 10:19:53 +0200 Subject: [PATCH 05/14] test against symengine/symengine#2026 --- .github/workflows/ci.yml | 3 +-- bin/test_symengine_unix.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4156101..33c2dceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,7 @@ jobs: PYTHON_VERSION: '3.12' TEST_SYMPY: yes OS: ubuntu-24.04 - CC: 'gcc -v' # symengine's bin/install_travis.sh needs refactoring... - CXX: 'g++ -v' + CC: gcc - BUILD_TYPE: Debug WITH_BFD: yes diff --git a/bin/test_symengine_unix.sh b/bin/test_symengine_unix.sh index 976f305d..63e3f6ca 100644 --- a/bin/test_symengine_unix.sh +++ b/bin/test_symengine_unix.sh @@ -2,10 +2,10 @@ export PYTHON_SOURCE_DIR=`pwd` export TEST_CPP="no" export MAKEFLAGS="-j2" -git clone https://github.com/symengine/symengine symengine-cpp +git clone -b update-CI https://github.com/bjodah/symengine symengine-cpp cd symengine-cpp export SOURCE_DIR=`pwd` -git checkout `cat ../symengine_version.txt` +#git checkout `cat ../symengine_version.txt` cd .. # Setup travis for C++ library From b4933abc696fcd7d68dc999db66888b264cad26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Fri, 31 May 2024 10:50:21 +0200 Subject: [PATCH 06/14] use gcc-13 & llvm-18 under ubuntu-24.04 --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33c2dceb..55c844f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: WITH_BFD: yes PYTHON_VERSION: '3.12' TEST_SYMPY: yes - OS: ubuntu-24.04 + OS: ubuntu-20.04 CC: gcc - BUILD_TYPE: Debug @@ -97,15 +97,16 @@ jobs: CC: clang - BUILD_TYPE: Debug - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.12' WITH_SYMPY: yes - WITH_LLVM: 14 + WITH_LLVM: 18 WITH_SCIPY: yes INTEGER_CLASS: 'boostmp' PYTEST_ADDOPTS: '-k "not integer_nthroot"' - OS: ubuntu-22.04 - EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main' - EXTRA_APT_PACKAGES: 'llvm-14' + OS: ubuntu-24.04 + CC: gcc # ubuntu nobel uses gcc-13 + #EXTRA_APT_REPOSITORY: 'deb http://apt.llvm.org/jammy/ llvm-toolchain-nobel-18 main' + EXTRA_APT_PACKAGES: 'llvm-18' - BUILD_TYPE: Debug PYTHON_VERSION: '3.8' From 43f282a8111970ed06ee813f75bf591edd257338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Fri, 31 May 2024 11:16:29 +0200 Subject: [PATCH 07/14] long is not a built-in --- symengine/lib/symengine_wrapper.in.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symengine/lib/symengine_wrapper.in.pyx b/symengine/lib/symengine_wrapper.in.pyx index 76b8288d..61cb4d6b 100644 --- a/symengine/lib/symengine_wrapper.in.pyx +++ b/symengine/lib/symengine_wrapper.in.pyx @@ -1214,7 +1214,7 @@ cdef class Basic(object): return int(float(self)) def __long__(self): - return long(float(self)) + return int(float(self)) def __complex__(self): f = self.n(real=False) From 4a8b629da7b5d14901f129de6eee4379d17cf654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Fri, 11 Jul 2025 17:52:59 +0200 Subject: [PATCH 08/14] bump ubuntu-20.04 -> 22.04 --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13e3399b..d8a8f085 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,34 +12,34 @@ jobs: WITH_BFD: yes PYTHON_VERSION: '3.12' TEST_SYMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Debug WITH_BFD: yes PYTHON_VERSION: '3.11' TEST_SYMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Debug WITH_BFD: yes PYTHON_VERSION: '3.10' TEST_SYMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Debug WITH_BFD: yes PYTHON_VERSION: '3.9' TEST_SYMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release PYTHON_VERSION: '3.13' BUILD_SHARED_LIBS: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release @@ -47,25 +47,25 @@ jobs: WITH_MPFR: yes INTEGER_CLASS: gmpxx WITH_NUMPY: no - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release PYTHON_VERSION: '3.13' WITH_MPC: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release WITH_MPFR: yes PYTHON_VERSION: '3.13' - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release PYTHON_VERSION: '3.9' WITH_MPC: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc - BUILD_TYPE: Release @@ -73,27 +73,27 @@ jobs: WITH_MPC: yes INTEGER_CLASS: flint WITH_FLINT: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: gcc #- BUILD_TYPE: Debug # PYTHON_VERSION: '3.9' # WITH_BFD: yes # WITH_PIRANHA: yes - # OS: ubuntu-20.04 + # OS: ubuntu-22.04 # CC: gcc - BUILD_TYPE: Debug PYTHON_VERSION: '3.13' WITH_BFD: yes BUILD_SHARED_LIBS: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: clang - BUILD_TYPE: Release PYTHON_VERSION: '3.13' WITH_NUMPY: yes - OS: ubuntu-20.04 + OS: ubuntu-22.04 CC: clang - BUILD_TYPE: Debug @@ -134,7 +134,7 @@ jobs: - BUILD_TYPE: Release PYTHON_VERSION: '3.11' - OS: ubuntu-20.04 + OS: ubuntu-22.04 WITH_MPC: yes WITH_MPFR: yes WITH_FLINT: yes From a42760575fa06aa608222372456fe68dbda28126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Fri, 11 Jul 2025 20:36:23 +0200 Subject: [PATCH 09/14] revert temporary changes in ci script --- bin/test_symengine_unix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/test_symengine_unix.sh b/bin/test_symengine_unix.sh index 63e3f6ca..976f305d 100644 --- a/bin/test_symengine_unix.sh +++ b/bin/test_symengine_unix.sh @@ -2,10 +2,10 @@ export PYTHON_SOURCE_DIR=`pwd` export TEST_CPP="no" export MAKEFLAGS="-j2" -git clone -b update-CI https://github.com/bjodah/symengine symengine-cpp +git clone https://github.com/symengine/symengine symengine-cpp cd symengine-cpp export SOURCE_DIR=`pwd` -#git checkout `cat ../symengine_version.txt` +git checkout `cat ../symengine_version.txt` cd .. # Setup travis for C++ library From 0cf427709abe1ce45a1998ff804e2cb1c5312445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ingvar=20Dahlgren?= Date: Sat, 12 Jul 2025 11:19:56 +0200 Subject: [PATCH 10/14] attempt updating CI scripts to match upstream --- .github/workflows/ci.yml | 10 ++++++++++ bin/test_symengine_unix.sh | 2 +- symengine_version.txt | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8a8f085..d0954617 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,6 +146,16 @@ jobs: CC: gcc steps: + + - uses: conda-incubator/setup-miniconda@v3 + if: matrix.MSYS_ENV == '' + with: + activate-environment: symengine + channel-priority: strict + architecture: x86_64 + channels: conda-forge + conda-remove-defaults: "true" + - name: Checkout code uses: actions/checkout@v4 diff --git a/bin/test_symengine_unix.sh b/bin/test_symengine_unix.sh index 976f305d..0c62b7d1 100644 --- a/bin/test_symengine_unix.sh +++ b/bin/test_symengine_unix.sh @@ -10,7 +10,7 @@ cd .. # Setup travis for C++ library cd $SOURCE_DIR -source bin/test_symengine_unix.sh +source bin/test_symengine.sh # Setup travis for Python wrappers cd $PYTHON_SOURCE_DIR diff --git a/symengine_version.txt b/symengine_version.txt index 549ada38..52a9266b 100644 --- a/symengine_version.txt +++ b/symengine_version.txt @@ -1 +1 @@ -153b7e98f310bccaae586dab6b49284ccd5f4174 +17871adbd8366d18fc8f372f23f07e508571de46 From 6b920b63966d784e3c0eba9932adb35379d0e665 Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Mon, 14 Jul 2025 13:50:22 +0200 Subject: [PATCH 11/14] add -el {0} to bash command (required by setup-miniconda) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0954617..77578d0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,7 +160,7 @@ jobs: uses: actions/checkout@v4 - name: Build and test symengine - shell: bash + shell: bash -el {0} run: | source bin/test_symengine_unix.sh env: From 40a91073c35f85cff54a5632a12b3c6675349dba Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Mon, 14 Jul 2025 13:59:31 +0200 Subject: [PATCH 12/14] remove activate - conda env should already be active --- bin/install_travis.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/install_travis.sh b/bin/install_travis.sh index 0460c58a..f63a4747 100644 --- a/bin/install_travis.sh +++ b/bin/install_travis.sh @@ -33,5 +33,4 @@ if [[ "${WITH_SYMPY}" != "no" ]]; then pip install sympy; fi -conda clean --all -source activate $our_install_dir; +conda clean --all \ No newline at end of file From 94e136126075daa4263d676d68bd0d400f99c09c Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Mon, 14 Jul 2025 14:05:58 +0200 Subject: [PATCH 13/14] use WITH_LATEST_GCC on ubuntu-24.04 job to avoid symengine CI script trying to use gcc-9 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77578d0d..c176f13e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,7 @@ jobs: WITH_SYMPY: yes WITH_LLVM: 18 WITH_SCIPY: yes + WITH_LATEST_GCC: yes INTEGER_CLASS: 'boostmp' PYTEST_ADDOPTS: '-k "not integer_nthroot"' OS: ubuntu-24.04 From 50682e97e748c135d0143ce02a830b080fff2730 Mon Sep 17 00:00:00 2001 From: Bjorn Date: Mon, 14 Jul 2025 14:41:00 +0200 Subject: [PATCH 14/14] Update symengine_version.txt --- symengine_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symengine_version.txt b/symengine_version.txt index 52a9266b..e49372be 100644 --- a/symengine_version.txt +++ b/symengine_version.txt @@ -1 +1 @@ -17871adbd8366d18fc8f372f23f07e508571de46 +c9510fb4b5c30b84adb993573a51f2a9a38a4cfe