Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Pyccel internal ND_Arrays to work with nvcc compiler #44

Draft
wants to merge 105 commits into
base: devel
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
f6ee2bb
Ensure master tests are triggered on cuda_main (#1305)
EmilyBourne Jan 12, 2023
cfe23d8
Merge remote-tracking branch 'other/master' into cuda_main
EmilyBourne Mar 14, 2023
6a11942
Fix commit
EmilyBourne Mar 14, 2023
e52035d
pip_installation no longer exists
EmilyBourne Mar 14, 2023
4f538e2
Add Code owners to protect merges
EmilyBourne Mar 14, 2023
7dd51f3
Debug coverage problem
EmilyBourne Mar 14, 2023
d1f61c5
Remove debugging
EmilyBourne Mar 14, 2023
b8e7b8c
Trigger codacy
EmilyBourne Mar 15, 2023
a7c3fc9
Trigger codacy
EmilyBourne Mar 16, 2023
79c2293
Correct folder
EmilyBourne Mar 17, 2023
2dbf5f9
Include cuda files in MANIFEST
EmilyBourne Mar 17, 2023
92155b4
Update checkout version
EmilyBourne Mar 17, 2023
e83d007
Import coverage fixes
EmilyBourne Mar 17, 2023
0c63927
Remove unnecessary echo
EmilyBourne Mar 17, 2023
6e066fe
Make faster as done in cuda_main_temp
EmilyBourne Mar 20, 2023
82d8577
Trigger codacy
EmilyBourne Mar 20, 2023
beb44ad
Try with coverage secret
EmilyBourne Mar 20, 2023
7638bc6
Add first commit to provide codacy baseline
EmilyBourne Mar 20, 2023
b0ad674
Only run benchmarks in Pyccel repo
EmilyBourne Mar 20, 2023
7d2fdb3
Merge remote-tracking branch 'cuda/master' into cuda_main
EmilyBourne Mar 20, 2023
70a9590
Trigger codacy with correct branch name
EmilyBourne Mar 21, 2023
58141cb
Merge pull request #1 from pyccel/cuda_main
EmilyBourne Mar 21, 2023
abf004b
Fix triggers
EmilyBourne Apr 3, 2023
4d46374
Merge branch 'pyccel:master' into master
EmilyBourne Apr 12, 2023
c2538e5
Merge branch 'master' into cuda_master
EmilyBourne Apr 13, 2023
713ee6b
Set up bot for cuda
EmilyBourne Apr 13, 2023
e406bc5
Correct double if
EmilyBourne Apr 13, 2023
7f4b669
Wrong file
EmilyBourne Apr 13, 2023
1d7aac2
Merge branch 'pyccel:master' into master
EmilyBourne Apr 13, 2023
03e42a1
Merge remote-tracking branch 'origin/master' into cuda_master
EmilyBourne Apr 16, 2023
d77057c
Correct typo
EmilyBourne Apr 16, 2023
1a2542d
Missing bot output
EmilyBourne Apr 17, 2023
3ab2ec5
Merge branch 'pyccel:master' into master
EmilyBourne Apr 18, 2023
d20c130
Merge branch 'pyccel:master' into master
EmilyBourne Apr 21, 2023
e3f7c00
Merge remote-tracking branch 'origin/master' into cuda_master
EmilyBourne Apr 26, 2023
1460194
Merge branch 'pyccel:master' into master
EmilyBourne Apr 27, 2023
843338b
Merge branch 'pyccel:master' into master
EmilyBourne Apr 28, 2023
fc06e37
Merge branch 'pyccel:devel' into main
EmilyBourne May 3, 2023
9041f73
Merge remote-tracking branch 'origin/devel' into cuda_main
EmilyBourne May 24, 2023
aae0bf3
Merge branch 'pyccel:devel' into main
EmilyBourne May 24, 2023
cc1b3aa
Merge branch 'pyccel:devel' into main
EmilyBourne Jun 3, 2023
1d3b44c
Merge branch 'pyccel:devel' into main
EmilyBourne Jun 14, 2023
c55931d
Merge branch 'pyccel:devel' into main
EmilyBourne Jul 4, 2023
137e9a9
Merge branch 'pyccel:devel' into main
EmilyBourne Jul 7, 2023
2d3c15b
Merge branch 'devel' into cuda_main
EmilyBourne Jul 14, 2023
c5c2b48
Merge branch 'devel' into cuda_main
EmilyBourne Aug 15, 2023
26005ff
Merge branch 'pyccel:devel' into devel
EmilyBourne Oct 10, 2023
4f35c95
Merge branch 'pyccel:devel' into main
EmilyBourne Oct 10, 2023
9fb7c6f
Merge branch 'main' into devel
EmilyBourne Oct 10, 2023
1c509d8
Merge branch 'devel' into cuda_main
EmilyBourne Nov 7, 2023
431ccd7
Merge branch 'main' into devel
EmilyBourne Nov 7, 2023
31ceb76
Merge branch 'pyccel:devel' into main
EmilyBourne Jan 3, 2024
987d458
Merge branch 'main' into devel
EmilyBourne Jan 3, 2024
c541b28
Merge remote-tracking branch 'origin/devel' into cuda_main
EmilyBourne Jan 11, 2024
6245454
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Jan 11, 2024
e858d5a
Merge branch 'pyccel:devel' into main
EmilyBourne Jan 15, 2024
2d0fbff
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Jan 15, 2024
dfef065
Fix indenting
EmilyBourne Jan 16, 2024
9e256c2
Add missing description
EmilyBourne Jan 16, 2024
8a80dcd
Reorder to ensure Python is available
EmilyBourne Jan 16, 2024
f1fc793
Specify test name
EmilyBourne Jan 16, 2024
47d661c
Report cuda_pytest outcome
EmilyBourne Jan 16, 2024
daf19de
Filter when cuda runs
EmilyBourne Jan 16, 2024
32fb825
Run cuda on devel
EmilyBourne Jan 16, 2024
980b393
Merge pull request #33 from pyccel/ebourne_bot_fix
EmilyBourne Jan 16, 2024
93ab357
Merge branch 'pyccel:devel' into main
EmilyBourne Feb 7, 2024
23d7d86
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Feb 7, 2024
484a85f
Merge branch 'devel' into cuda_main
EmilyBourne Feb 12, 2024
3e17adf
Merge branch 'main' into devel
EmilyBourne Feb 12, 2024
a6368b2
Merge remote-tracking branch 'origin/devel' into cuda_main
EmilyBourne Feb 14, 2024
9ef6973
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Feb 14, 2024
b140e88
Fix bot PR state calculation
EmilyBourne Feb 15, 2024
f89bb2b
Merge remote-tracking branch 'origin/devel' into cuda_main
EmilyBourne Feb 16, 2024
8c12e55
Merge branch 'pyccel:devel' into main
EmilyBourne Feb 23, 2024
f6d5ee9
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Feb 23, 2024
55b42fe
Merge branch 'pyccel:devel' into main
EmilyBourne Feb 28, 2024
693bc9d
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Feb 28, 2024
5295ee2
[init] Adding CUDA language/compiler and CodePrinter (#32)
bauom Feb 28, 2024
9651be0
Merge branch 'pyccel:devel' into main
EmilyBourne Mar 2, 2024
f8884fe
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Mar 2, 2024
b927037
Ensure tests are run on push
EmilyBourne Mar 4, 2024
2c9ccad
Ensure tests are triggered on main branch
EmilyBourne Mar 4, 2024
ec7e4ab
Merge branch 'main' into devel
EmilyBourne Mar 4, 2024
1f9ca8c
use __cplusplus macro to remove complex type
bauom Mar 4, 2024
54c4423
made array create works with cuda - seperated the compound literal fr…
bauom Mar 4, 2024
82006d5
removed _Generic Macros
bauom Mar 4, 2024
0ae88a3
added required imports
bauom Mar 4, 2024
16f5a1b
continuation of removing _Generic printing the correct array_fill
bauom Mar 4, 2024
536e1f0
fixed stack arrays in cuda printing
bauom Mar 4, 2024
cd67474
activated CPU cuda array tests
bauom Mar 4, 2024
ac5642d
activated more arrays tests
bauom Mar 4, 2024
cac8f58
Merge branch 'devel' of https://github.com/pyccel/pyccel-cuda into ar…
bauom Mar 4, 2024
2b303ee
EOF line
bauom Mar 4, 2024
67674ce
fixed a bug in the array_fill
bauom Mar 4, 2024
a9eb68b
activated more arrays tests
bauom Mar 4, 2024
aace39c
added missing import
bauom Mar 4, 2024
7904dc8
using f_string instead of format
bauom Mar 4, 2024
bc4b2cf
Merge branch 'pyccel:devel' into main
EmilyBourne Mar 5, 2024
dcc626c
Merge remote-tracking branch 'origin/main' into devel
EmilyBourne Mar 5, 2024
e0aa507
Merge branch 'devel' into arrays_support
EmilyBourne Mar 5, 2024
051710d
Trigger tests on push to devel or main branch
EmilyBourne Mar 11, 2024
7be2a71
Add cuda workflow to test cuda developments on CI
EmilyBourne Mar 11, 2024
4db5163
[init] Adding CUDA language/compiler and CodePrinter (#32)
bauom Feb 28, 2024
2a7f4d9
Merge remote-tracking branch 'origin/devel' into arrays_support
EmilyBourne Mar 12, 2024
1b1bd67
Ensure that triggering coverage also triggers dependencies
EmilyBourne Mar 12, 2024
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
1 change: 1 addition & 0 deletions .dict_custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,6 @@ Valgrind
variadic
subclasses
oneAPI
Cuda
getter
setter
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @EmilyBourne @bauom

2 changes: 1 addition & 1 deletion .github/actions/coverage_install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
- name: Directory Creation
run: |
INSTALL_DIR=$(cd tests; python -c "import pyccel; print(pyccel.__path__[0])")
SITE_DIR=$(python -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
SITE_DIR=$(dirname ${INSTALL_DIR})
echo -e "import coverage; coverage.process_startup()" > ${SITE_DIR}/pyccel_cov.pth
echo -e "[run]\nparallel = True\nsource = ${INSTALL_DIR}\ndata_file = $(pwd)/.coverage\n[report]\ninclude = ${INSTALL_DIR}/*\n[xml]\noutput = cobertura.xml" > .coveragerc
echo "SITE_DIR=${SITE_DIR}" >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/linux_install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ runs:
shell: bash
- name: Install fortran
run:
sudo apt-get install gfortran
sudo apt-get install -y gfortran
shell: bash
- name: Install LaPack
run:
sudo apt-get install libblas-dev liblapack-dev
sudo apt-get install -y libblas-dev liblapack-dev
shell: bash
- name: Install MPI
run: |
sudo apt-get install libopenmpi-dev openmpi-bin
sudo apt-get install -y libopenmpi-dev openmpi-bin
echo "MPI_OPTS=--oversubscribe" >> $GITHUB_ENV
shell: bash
- name: Install OpenMP
run:
sudo apt-get install libomp-dev libomp5
sudo apt-get install -y libomp-dev libomp5
shell: bash
- name: Install Valgrind
run:
sudo apt-get install valgrind
sudo apt-get install -y valgrind
shell: bash
4 changes: 2 additions & 2 deletions .github/actions/pytest_parallel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ runs:
steps:
- name: Test with pytest
run: |
mpiexec -n 4 ${MPI_OPTS} python -m pytest epyccel/test_parallel_epyccel.py -v -m parallel -rXx
#mpiexec -n 4 ${MPI_OPTS} python -m pytest epyccel -v -m parallel -rXx
mpiexec -n 4 ${MPI_OPTS} python -m pytest epyccel/test_parallel_epyccel.py -v -m "parallel and not cuda" -rXx
#mpiexec -n 4 ${MPI_OPTS} python -m pytest epyccel -v -m "parallel and not cuda" -rXx
shell: ${{ inputs.shell_cmd }}
working-directory: ./tests

4 changes: 2 additions & 2 deletions .github/actions/pytest_run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ runs:
working-directory: ./tests
id: pytest_3
- name: Test Fortran translations
run: python -m pytest -n auto -rX ${FLAGS} -m "not (parallel or xdist_incompatible) and not (c or python) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays 2>&1 | tee s4_outfile.out
run: python -m pytest -n auto -rX ${FLAGS} -m "not (parallel or xdist_incompatible) and not (c or python or cuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays 2>&1 | tee s4_outfile.out
shell: ${{ inputs.shell_cmd }}
working-directory: ./tests
id: pytest_4
- name: Test multi-file Fortran translations
run: |
python -m pytest -rX ${FLAGS} -m "xdist_incompatible and not parallel and not (c or python) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays 2>&1 | tee s5_outfile.out
python -m pytest -rX ${FLAGS} -m "xdist_incompatible and not parallel and not (c or python or cuda) ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays 2>&1 | tee s5_outfile.out
pyccel-clean
shell: ${{ inputs.shell_cmd }}
working-directory: ./tests
Expand Down
24 changes: 24 additions & 0 deletions .github/actions/pytest_run_cuda/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'Pyccel pytest commands generating Cuda'
inputs:
shell_cmd:
description: 'Specifies the shell command (different for anaconda)'
required: false
default: "bash"

runs:
using: "composite"
steps:
- name: Ccuda tests with pytest
run: |
# Catch exit 5 (no tests found)
python -m pytest -rX ${FLAGS} -m "not (xdist_incompatible or parallel) and cuda ${{ inputs.pytest_mark }}" --ignore=symbolic --ignore=ndarrays 2>&1 | tee s1_outfile.out
pyccel-clean
shell: ${{ inputs.shell_cmd }}
working-directory: ./tests
- name: Final step
if: always()
id: status
run:
python ci_tools/json_pytest_output.py -t "Cuda Test Summary" --tests "Cuda tests:${{ steps.pytest_1.outcome }}:tests/s1_outfile.out"

shell: ${{ inputs.shell_cmd }}
17 changes: 17 additions & 0 deletions .github/actions/python_install/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Python installation commands'

runs:
using: "composite"
steps:
- name: Install python
run:
sudo apt-get -y install python3-dev
shell: bash
- name: python as python3
run:
sudo apt-get -y install python-is-python3
shell: bash
- name: Install Pip
run:
sudo apt-get -y install python3-pip
shell: bash
4 changes: 2 additions & 2 deletions .github/workflows/anaconda_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -28,7 +28,7 @@ env:
jobs:
Python_version_picker:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-python_version.outputs.python_version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/anaconda_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -28,7 +28,7 @@ env:
jobs:
Python_version_picker:
runs-on: windows-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-python_version.outputs.python_version }}
steps:
Expand Down
67 changes: 67 additions & 0 deletions .github/workflows/coverage_collect.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Unit test coverage collection

on:
workflow_call:
inputs:
python_version:
required: true
type: string
ref:
required: false
type: string
cuda_result:
required: true
type: string

jobs:
CoverageChecker:

runs-on: ubuntu-latest
name: Unit tests

steps:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.ref }}
- name: Set up Python ${{ inputs.python_version }}
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python_version }}
- name: Install dependencies
uses: ./.github/actions/linux_install
- name: Install coverage
run: |
python -m pip install --upgrade pip
python -m pip install coverage
shell: bash
- name: Collect coverage information
uses: actions/download-artifact@v3
with:
name: coverage-artifact
- name: Rename coverage file
run: mv .coverage .coverage.linux
- name: Collect coverage information
uses: actions/download-artifact@v3
if: ${{ inputs.cuda_result }} == 'success'
with:
name: cuda-coverage-artifact
- name: Rename coverage file
if: ${{ inputs.cuda_result }} == 'success'
run: mv .coverage .coverage.cuda
- name: Generate coverage report
run: |
echo -e "[paths]\nsource =\n $(pwd)/pyccel\n */site-packages/pyccel\n[xml]\noutput = cobertura.xml" > .coveragerc
coverage combine
coverage xml
- name: Run codacy-coverage-reporter
uses: codacy/codacy-coverage-reporter-action@master
continue-on-error: True
with:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: cobertura.xml
- name: Save code coverage xml report
uses: actions/upload-artifact@v3
with:
name: coverage-artifact-xml
path: cobertura.xml
retention-days: 1
83 changes: 83 additions & 0 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Cuda unit tests

on:
workflow_dispatch:
inputs:
python_version:
required: false
type: string
ref:
required: false
type: string
check_run_id:
required: false
type: string
pr_repo:
required: false
type: string
push:
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
PEM: ${{ secrets.BOT_PEM }}
GITHUB_RUN_ID: ${{ github.run_id }}
GITHUB_CHECK_RUN_ID: ${{ inputs.check_run_id }}
PR_REPO: ${{ inputs.pr_repo || github.repository }}

jobs:
Cuda:

runs-on: ubuntu-20.04
name: Unit tests

container: nvidia/cuda:11.7.1-devel-ubuntu20.04
steps:
- uses: actions/checkout@v3
with:
ref: ${{ env.COMMIT }}
repository: ${{ env.PR_REPO }}
- name: Prepare docker
run: |
apt update && apt install sudo
TZ=Europe/France
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
shell: bash
- name: Install python (setup-python action doesn't work with containers)
uses: ./.github/actions/python_install
- name: "Setup"
id: token
run: |
pip install jwt requests
python ci_tools/setup_check_run.py cuda
- name: CUDA Version
run: nvcc --version # cuda install check
- name: Install dependencies
uses: ./.github/actions/linux_install
- name: Install Pyccel with tests
run: |
PATH=${PATH}:$HOME/.local/bin
echo "PATH=${PATH}" >> $GITHUB_ENV
python -m pip install --upgrade pip
python -m pip install --user .[test]
shell: bash
- name: Coverage install
uses: ./.github/actions/coverage_install
- name: Ccuda tests with pytest
id: cuda_pytest
uses: ./.github/actions/pytest_run_cuda
- name: Collect coverage information
continue-on-error: True
uses: ./.github/actions/coverage_collection
- name: Save code coverage report
uses: actions/upload-artifact@v3
with:
name: coverage-artifact
path: .coverage
retention-days: 1
- name: "Post completed"
if: always()
run:
python ci_tools/complete_check_run.py ${{ steps.cuda_pytest.outcome }}

4 changes: 2 additions & 2 deletions .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -29,7 +29,7 @@ env:
jobs:
Python_version_picker:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-python_version.outputs.python_version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -28,7 +28,7 @@ env:
jobs:
matrix_prep:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macosx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -28,7 +28,7 @@ env:
jobs:
Python_version_picker:
runs-on: macos-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-python_version.outputs.python_version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pickle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -31,7 +31,7 @@ env:
jobs:
Python_version_picker:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-matrix.outputs.python_version }}
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pickle_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
required: false
type: string
push:
branches: devel
branches: [devel, main]

env:
COMMIT: ${{ inputs.ref || github.event.ref }}
Expand All @@ -28,7 +28,7 @@ env:
jobs:
Python_version_picker:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel'
if: github.event_name != 'push' || github.repository == 'pyccel/pyccel-cuda'
outputs:
python_version: ${{ steps.set-python_version.outputs.python_version }}
steps:
Expand Down
Loading