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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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)