diff --git a/.github/actions/install/struphy-in-container/action.yml b/.github/actions/install/struphy-in-container/action.yml deleted file mode 100644 index f97038b2a..000000000 --- a/.github/actions/install/struphy-in-container/action.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Install Struphy in Container - -description: - -inputs: - compile_language: - required: true - default: c - struphy_branch: - required: true - default: devel - -runs: - using: composite - steps: - - name: Git branch name - id: git-branch-name - uses: EthanSK/git-branch-name-action@v1 - - name: Echo the branch name - shell: bash - run: echo "Branch name ${GIT_BRANCH_NAME}" - - name: Install psydac - shell: bash - run: | - ls / -a - which python3 - git clone https://github.com/struphy-hub/struphy.git - cd struphy - echo ${{ inputs.struphy_branch }} - git checkout ${{ inputs.struphy_branch }} - git pull - source /struphy_${{ inputs.compile_language }}_/env_${{ inputs.compile_language }}_/bin/activate - pip show struphy - struphy compile -d - pip uninstall struphy -y - python3 -m pip install . --force-reinstall --no-cache-dir \ No newline at end of file diff --git a/.github/workflows/test-PR-struphy.yml b/.github/workflows/test-PR-struphy.yml deleted file mode 100644 index 3b8dc5a13..000000000 --- a/.github/workflows/test-PR-struphy.yml +++ /dev/null @@ -1,121 +0,0 @@ -name: PR - test Struphy in container - -on: - pull_request: - branches: [devel-tiny] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -defaults: - run: - shell: bash - -permissions: - contents: read - -jobs: - test_struphy: - runs-on: ubuntu-latest - - container: - image: ghcr.io/struphy-hub/struphy/ubuntu-with-struphy:latest - credentials: - username: spossann - password: ${{ secrets.GHCR_PROJECT_TOKEN }} - - strategy: - fail-fast: false - matrix: - # TODO: Make sure that struphy works with python > 3.11, keep the lower bound to 3.10 - python-version: [ '3.12' ] - compile_language: ['fortran'] #, 'c'] - - name: Test Struphy for Python ${{ matrix.python-version }} / ${{ matrix.compile_language }} - - steps: - - name: Check for dockerenv file - run: (ls /.dockerenv && echo Found dockerenv) || (echo No dockerenv) - - - name: Checkout repo - uses: actions/checkout@v4 - - - name: Check .testmondata 1 - run: | - ls .testmon* || echo "No .testmondata" - - - name: Setup cache for testmon - uses: actions/cache@v4 - with: - path: | - .testmondata-struphy-${{ matrix.compile_language }} - .testmondata-struphy-${{ matrix.compile_language }}-mpi - key: testmon-struphy-${{ matrix.compile_language }}-${{ github.ref_name }}-${{ github.event.number }}-${{ github.run_number }} - restore-keys: | - testmon-struphy-${{ matrix.compile_language }}-${{ github.ref_name }}-${{ github.event.number }}- - testmon-struphy-${{ matrix.compile_language }}-${{ github.ref_name }} - testmon-struphy-${{ matrix.compile_language }}-devel - testmon-struphy-${{ matrix.compile_language }}- - testmon-struphy- - - - name: Check .testmondata 2 - run: | - ls .testmon* || echo "No .testmondata" - - - name: Install Psydac in container - uses: ./.github/actions/install/psydac-in-container - with: - compile_language: ${{ matrix.compile_language }} - - - name: Compile all kernels - run: | - source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - psydac-accelerate --language ${{ matrix.compile_language }} - # struphy compile --language ${{ matrix.compile_language }} - - - name: Run struphy unit tests - env: - TESTMON_DATAFILE: ${{ github.workspace }}/.testmondata-struphy-${{ matrix.compile_language }} - TEST_FILES: "bsplines/tests/ \ - console/tests/ \ - feec/tests/ \ - fields_background/tests/ \ - geometry/tests/ \ - initial/tests/ \ - kinetic_background/tests/ \ - linear_algebra/tests/ \ - ode/tests/ \ - pic/tests/ \ - polar/tests/ \ - post_processing/tests/ \ - propagators/tests/" - run: | - source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - PYTHON=$(which python) - STRUPHY_PATH=$($PYTHON -c "import struphy; print(struphy.__path__[0])") - echo "Struphy is installed at: $STRUPHY_PATH" - echo "STRUPHY_PATH=${STRUPHY_PATH}" >> $GITHUB_ENV - mpirun -n 1 pytest -m single --testmon-forceselect -s --with-mpi --model-name Maxwell $STRUPHY_PATH - cd $STRUPHY_PATH - pytest --testmon $TEST_FILES - - - name: Run struphy model tests - env: - TESTMON_DATAFILE: ${{ github.workspace }}/.testmondata-struphy-${{ matrix.compile_language }} - run: | - source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - pytest -m models --testmon-forceselect $STRUPHY_PATH/models/tests/default_params/ - - - name: Install mpi4py - run: | - source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - pip install -U mpi4py - - - name: Run struphy model tests with mpi - env: - TESTMON_DATAFILE: ${{ github.workspace }}/.testmondata-struphy-${{ matrix.compile_language }}-mpi - run: | - source /struphy_${{ matrix.compile_language }}_/env_${{ matrix.compile_language }}_/bin/activate - mpirun -n 1 pytest -m single --testmon-forceselect -s --with-mpi --model-name Maxwell $STRUPHY_PATH - mpirun -oversubscribe -n 2 pytest -m models --testmon-forceselect --with-mpi $STRUPHY_PATH/models/tests/default_params/ \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index dafc3f469..cc58c3dd1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "feectools" -version = "0.1.3" +version = "0.1.4" description = "Slimmed-down fork of Psydac (https://github.com/pyccel/psydac) with less functionality and fewer dependencies." readme = "README.md" requires-python = ">= 3.10"