From fcbd21faa358e3d88978c64fad87570a189bd7bf Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Fri, 12 Dec 2025 08:52:27 +0100 Subject: [PATCH 1/5] add compile -v flag to pyccel command in make file; set lower bound pyccel>=2.1.0 --- feectools/accelerate/compile_psydac.mk | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/feectools/accelerate/compile_psydac.mk b/feectools/accelerate/compile_psydac.mk index e4d2b172f..fc09fe48b 100644 --- a/feectools/accelerate/compile_psydac.mk +++ b/feectools/accelerate/compile_psydac.mk @@ -37,7 +37,7 @@ all: $(OUTPUTS) @for dep in $^ ; do \ echo $$dep ; \ done - pyccel $(FLAGS)$(FLAGS_openmp) $< + pyccel compile -v $(FLAGS)$(FLAGS_openmp) $< @echo "" #-------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index dd0134f0b..5039f4dd8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ dependencies = [ 'pyevtk', # Our packages from PyPi - 'pyccel >= 2.0.1', + 'pyccel >= 2.1.0', 'h5py', # When pyccel is run in parallel with MPI, it uses tblib to pickle From 2c1bce6b291dea4329ed9d25496f49090f3e8057 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Fri, 12 Dec 2025 09:01:04 +0100 Subject: [PATCH 2/5] do not re-install struphy in container --- .github/workflows/test-PR-struphy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-PR-struphy.yml b/.github/workflows/test-PR-struphy.yml index ae39044a2..221135a89 100644 --- a/.github/workflows/test-PR-struphy.yml +++ b/.github/workflows/test-PR-struphy.yml @@ -63,12 +63,12 @@ jobs: run: | ls .testmon* || echo "No .testmondata" - # temporary - remove after feectools merge - - name: Install Struphy in container - uses: ./.github/actions/install/struphy-in-container - with: - compile_language: ${{ matrix.compile_language }} - struphy_branch: 146-install-feectools + # # temporary - remove after feectools merge + # - name: Install Struphy in container + # uses: ./.github/actions/install/struphy-in-container + # with: + # compile_language: ${{ matrix.compile_language }} + # struphy_branch: 146-install-feectools - name: Install Psydac in container uses: ./.github/actions/install/psydac-in-container @@ -78,8 +78,8 @@ jobs: - name: Compile all kernels run: | source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - struphy compile --language ${{ matrix.compile_language }} - # psydac-accelerate --language ${{ matrix.compile_language }} + psydac-accelerate --language ${{ matrix.compile_language }} + # struphy compile --language ${{ matrix.compile_language }} - name: Run struphy unit tests env: From 882a4fe80a43a27779aec2a51ba5b0c28eb7bcf4 Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Fri, 12 Dec 2025 10:03:02 +0100 Subject: [PATCH 3/5] replace psydac -> feectools in struphy test --- .github/workflows/test-struphy.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-struphy.yml b/.github/workflows/test-struphy.yml index 8ab994366..10608aa09 100644 --- a/.github/workflows/test-struphy.yml +++ b/.github/workflows/test-struphy.yml @@ -67,26 +67,24 @@ jobs: - name: Install struphy without mpi #TODO: Set branch to devel working-directory: ${{ env.STRUPHY_DIR }} run: | - echo "Psydac location for this branch" - pip show psydac - pip uninstall psydac -y + pip show feectools + pip uninstall feectools -y python -m pip install ".[phys]" --no-cache-dir - echo "Psydac location after installing struphy" - pip show psydac + echo "feectools location after installing struphy" + pip show feectools - - name: Re-install Psydac from the current branch + - name: Re-install feectools from the current branch run: | - echo "Uninstall psydac" psydac-accelerate --cleanup --yes - pip show psydac - pip uninstall psydac -y + pip show feectools + pip uninstall feectools -y python -m pip install ${{ env.PSYDAC_DIR }} --force-reinstall --no-cache-dir - echo "Psydac location after installing psydac from the current branch (should be the same as in the previous step)" - pip show psydac + echo "feectools location after installing feectools from the current branch (should be the same as in the previous step)" + pip show feectools - name: Compile struphy run: | - pip show psydac + pip show feectools struphy -h struphy compile -y --language ${{ matrix.compile_language }} From 9be4c042765e9826b77bd185b56d686a664d736a Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Fri, 12 Dec 2025 10:09:01 +0100 Subject: [PATCH 4/5] replace also in PR test --- .github/actions/install/psydac-in-container/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/install/psydac-in-container/action.yml b/.github/actions/install/psydac-in-container/action.yml index cf04e9a3d..3f3f4289e 100644 --- a/.github/actions/install/psydac-in-container/action.yml +++ b/.github/actions/install/psydac-in-container/action.yml @@ -25,7 +25,7 @@ runs: git checkout ${GIT_BRANCH_NAME} git pull source /struphy_${{ inputs.compile_language }}_/env_${{ inputs.compile_language }}_/bin/activate - pip show psydac + pip show feectools psydac-accelerate --cleanup --yes - pip uninstall psydac -y + pip uninstall feectools -y python3 -m pip install . --force-reinstall --no-cache-dir \ No newline at end of file From 525d9d725fb86af8cfc19a323d22d97a981c588c Mon Sep 17 00:00:00 2001 From: Stefan Possanner Date: Fri, 12 Dec 2025 10:57:07 +0100 Subject: [PATCH 5/5] bump version number to 0.1.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5039f4dd8..989d50e98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "feectools" -version = "0.1.0" +version = "0.1.1" description = "Slimmed-down fork of Psydac (https://github.com/pyccel/psydac) with less functionality and fewer dependencies." readme = "README.md" requires-python = ">= 3.10"