Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/install/psydac-in-container/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 8 additions & 8 deletions .github/workflows/test-PR-struphy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/test-struphy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion feectools/accelerate/compile_psydac.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ all: $(OUTPUTS)
@for dep in $^ ; do \
echo $$dep ; \
done
pyccel $(FLAGS)$(FLAGS_openmp) $<
pyccel compile -v $(FLAGS)$(FLAGS_openmp) $<
@echo ""

#--------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down