diff --git a/.github/workflows/asv.yml b/.github/workflows/asv.yml deleted file mode 100644 index ec75cb81ccf..00000000000 --- a/.github/workflows/asv.yml +++ /dev/null @@ -1,96 +0,0 @@ -# Runner information: -# CPU: Intel(R) Core(TM) i7-6700K CPU @ 4.00GHz -# GPU: NVIDIA GeForce RTX 2060 - -name: asv-benchmarks - -env: - OUTPUT_PATH: ${{ github.workspace }} - ENVHOME: "/home/devito/environments" - -on: - workflow_dispatch: - inputs: - tags: - description: 'Run ASV' - # Trigger the workflow on push to the master branch - push: - branches: - - master - -jobs: - - # Run the asv benchmarks on the self-hosted runner - benchmarks: - name: benchmarks - runs-on: [self-hosted, asv] - - env: - DEVITO_ARCH: "gcc-9" - DEVITO_LANGUAGE: "openmp" - DEVITO_BENCHMARKS: "1" - DEVITO_LOGGING: "PERF" - OMP_NUM_THREADS: "8" - CC: "gcc-9" - CXX: "g++-9" - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Set VIRTUAL_ENV - run: | - echo "VIRTUAL_ENV=$ENVHOME/asv" >> $GITHUB_ENV - echo "PATH=$VIRTUAL_ENV/bin:$PATH" >> $GITHUB_ENV - - - name: Set PATH - run: | - echo "PATH=$VIRTUAL_ENV/bin:$PATH" >> $GITHUB_ENV - - - name: Install dependencies - run: | - pip install --upgrade pip - pip install --upgrade asv - - - name: Setup asv - run: | - asv machine --config benchmarks/regression/asv.conf.json --machine i7-6700K --os ubuntu-20.10 --arch x86-64 --cpu i7-6700K --num_cpu 8 --ram 16GB - - - name: Run benchmarks - run: | - asv run -v --show-stderr --config benchmarks/regression/asv.conf.json --cpu-affinity 0-7 --machine i7-6700K - - - name: Checkout asv-results branch - uses: actions/checkout@v3 - with: - ref: asv-results - clean: false - - - name: Commit benchmarks results - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - asv run --config benchmarks/regression/asv.conf.json --bench just-discover --machine i7-6700K - git add -f benchmarks/regression/.asv/results/ - git status - git commit -m "Commit ASV results" - - - name: Push benchmarks results to the asv-results branch - uses: ad-m/github-push-action@master - with: - branch: asv-results - force: true - github_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Create results (html) - run: | - asv publish --config benchmarks/regression/asv.conf.json - rm -f /tmp/ssh-auth.sock - - - name: Deploy results to devitocodes/devito-performance/gh-pages - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} - external_repository: devitocodes/devito-performance - publish_branch: gh-pages - publish_dir: ./benchmarks/regression/.asv/html diff --git a/.github/workflows/docker-bases.yml b/.github/workflows/docker-bases.yml deleted file mode 100644 index 96846320fc5..00000000000 --- a/.github/workflows/docker-bases.yml +++ /dev/null @@ -1,214 +0,0 @@ -name: Build base compilers docker images - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -on: - push: - paths: - - '/docker/Dockerfile.nvidia' - - '/docker/Dockerfile.cpu' - - '/docker/Dockerfile.amd' - workflow_dispatch: - inputs: - tags: - description: 'Build compiler bases' - schedule: - # Run once a week - - cron: "0 13 * * 1" - -jobs: -####################################################### -############## Basic gcc CPU ########################## -####################################################### - deploy-cpu-bases: - name: "cpu-base" - runs-on: ubuntu-latest - env: - DOCKER_BUILDKIT: "1" - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Check event name - run: echo ${{ github.event_name }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: cleanup - run: docker system prune -a -f - - - name: GCC image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.cpu' - push: true - target: 'gcc' - build-args: 'arch=gcc' - tags: 'devitocodes/bases:cpu-gcc' - -####################################################### -############## Intel OneApi CPU ####################### -####################################################### - deploy-oneapi-bases: - name: "oneapi-base" - runs-on: ubuntu-latest - env: - DOCKER_BUILDKIT: "1" - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Check event name - run: echo ${{ github.event_name }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: cleanup - run: docker system prune -a -f - - - name: ICX image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.cpu' - push: true - target: 'icx' - build-args: 'arch=icx' - tags: 'devitocodes/bases:cpu-icx' - -####################################################### -################### Nvidia nvhpc ###################### -####################################################### - deploy-nvidia-bases: - name: "nvidia-bases" - runs-on: ["self-hosted", "nvidiagpu"] - env: - DOCKER_BUILDKIT: "1" - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Check event name - run: echo ${{ github.event_name }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: cleanup - run: docker system prune -a -f - - - name: NVC image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.nvidia' - push: true - target: 'nvc' - build-args: 'arch=nvc' - tags: 'devitocodes/bases:nvidia-nvc' - - - name: NVCC image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.nvidia' - push: true - target: 'nvcc' - build-args: 'arch=nvcc' - tags: 'devitocodes/bases:nvidia-nvcc' - - - name: NVC host image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.nvidia' - push: true - target: 'nvc-host' - build-args: 'arch=nvc-host' - tags: 'devitocodes/bases:cpu-nvc' - -####################################################### -##################### AMD ############################# -####################################################### - deploy-amd-bases: - name: "amd-base" - runs-on: ["self-hosted", "amdgpu"] - env: - DOCKER_BUILDKIT: "1" - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Check event name - run: echo ${{ github.event_name }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: cleanup - run: docker system prune -a -f - - - name: AMD image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.amd' - push: true - target: 'amdclang' - tags: devitocodes/bases:amd - - - name: AMD HIP image - uses: docker/build-push-action@v3 - with: - context: . - file: './docker/Dockerfile.amd' - push: true - target: 'hip' - build-args: | - arch=hip - tags: devitocodes/bases:amd-hip diff --git a/.github/workflows/docker-devito.yml b/.github/workflows/docker-devito.yml deleted file mode 100644 index 597eed67405..00000000000 --- a/.github/workflows/docker-devito.yml +++ /dev/null @@ -1,109 +0,0 @@ -name: Publish devito docker images from compiler bases - -on: - release: - types: [published] - push: - branches: - - master # Push events on master branch - -jobs: - deploy-devito: - runs-on: ${{ matrix.runner }} - env: - # Use buildkit https://docs.docker.com/develop/develop-images/build_enhancements/ for better build - DOCKER_BUILDKIT: "1" - - strategy: - fail-fast: false - matrix: - include: - - base: 'bases:nvidia-nvc' - tag: 'nvidia-nvc' - flag: '--gpus all' - test: 'tests/test_gpu_openacc.py tests/test_gpu_common.py' - runner: ["self-hosted", "nvidiagpu"] - - # Runtime gpu flags from https://hub.docker.com/r/rocm/tensorflow/ - - base: 'bases:amd' - tag: 'amd' - flag: '--network=host --device=/dev/kfd --device=/dev/dri --ipc=host --group-add video --group-add $(getent group render | cut -d: -f3) --cap-add=SYS_PTRACE --security-opt seccomp=unconfined' - test: 'tests/test_gpu_openmp.py' - runner: ["self-hosted", "amdgpu"] - - - base: 'bases:cpu-gcc' - tag: "gcc" - flag: '' - test: 'tests/test_operator.py' - runner: ubuntu-latest - - - base: 'bases:cpu-icx' - tag: "icx" - flag: '' - test: 'tests/test_operator.py' - runner: ubuntu-latest - - steps: - - name: Checkout devito - uses: actions/checkout@v3 - - - name: Check event name - run: echo ${{ github.event_name }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - flavor: | - latest=false - images: | - devitocodes/devito - # Creates all the tags to be pushed. - # `event`` is the trigger even (pr for pull request, tag for release) - # `value/pattern` is the actual tag - # `enable` is a "if" filter fir that tag - # `type` is the type of tag - tags: | - type=raw,value=${{ matrix.tag }}-dev - type=raw,value=${{ matrix.tag }}-latest,enable=${{ github.event_name == 'release' }} - type=raw,value=latest,enable=${{ matrix.base == 'bases:cpu-gcc' }} - type=semver,pattern={{raw}},prefix=${{ matrix.tag }}-,enable=${{ github.event_name == 'release' }} - # Legacy "gpu" tag - type=raw,value=gpu-dev,enable=${{ matrix.base == 'bases:nvidia-nvc' }} - type=semver,pattern={{raw}},prefix=gpu-,enable=${{ github.event_name == 'release' && matrix.base == 'bases:nvidia-nvc' }} - type=semver,pattern={{raw}},value=gpu-latest,enable=${{ github.event_name == 'release' && matrix.base == 'bases:nvidia-nvc' }} - # Legacy "cpu" tag - type=raw,value=cpu-dev,enable=${{ matrix.base == 'bases:cpu-gcc' }} - type=semver,pattern={{raw}},prefix=cpu-,enable=${{ github.event_name == 'release' && matrix.base == 'bases:cpu-gcc' }} - type=semver,pattern={{raw}},value=cpu-latest,enable=${{ github.event_name == 'release' && matrix.base == 'bases:cpu-gcc' }} - - - name: Check tags - run: echo "${{ steps.meta.outputs.tags }}" - - - name: Build and push image - uses: docker/build-push-action@v3 - with: - context: . - file: ./docker/Dockerfile.devito - push: true - tags: ${{ steps.meta.outputs.tags }} - build-args: base=devitocodes/${{ matrix.base }} - - - name: Remove dangling layers - run: docker system prune -f - - - name: Run tests - run: | - docker run ${{ matrix.flag }} --rm --name testrun 'devitocodes/devito:${{ matrix.tag }}-dev' pytest ${{ matrix.test }} diff --git a/devito/ir/ietxdsl/ietxdsl_functions.py b/devito/ir/ietxdsl/ietxdsl_functions.py index f5e460ed27a..08d8e7b51d2 100644 --- a/devito/ir/ietxdsl/ietxdsl_functions.py +++ b/devito/ir/ietxdsl/ietxdsl_functions.py @@ -38,7 +38,6 @@ def calculateAddArguments(arguments): def add_to_block(expr, arg_by_expr: dict[Any, Operation], result): - # # import pdb;pdb.set_trace() if expr in arg_by_expr: return @@ -128,7 +127,6 @@ def add_to_block(expr, arg_by_expr: dict[Any, Operation], result): if isinstance(expr, nodes.Return): # Covert a Return node - # # import pdb;pdb.set_trace() return if isinstance(expr, Mod): @@ -150,7 +148,6 @@ def add_to_block(expr, arg_by_expr: dict[Any, Operation], result): return if isinstance(expr, Indexed): - # import pdb;pdb.set_trace() for arg in expr.args: add_to_block(arg, arg_by_expr, result) diff --git a/devito/operator/xdsl_operator.py b/devito/operator/xdsl_operator.py index 997b984ff6e..dec407adc0b 100644 --- a/devito/operator/xdsl_operator.py +++ b/devito/operator/xdsl_operator.py @@ -193,7 +193,6 @@ def _jit_compile(self): # compile IR using xdsl-opt | mlir-opt | mlir-translate | clang try: cflags = CFLAGS - # import pdb;pdb.set_trace() cc = "clang" if is_mpi: diff --git a/fast/wave2d_b.py b/fast/wave2d_b.py index edb8ae83b19..086c8fe2144 100644 --- a/fast/wave2d_b.py +++ b/fast/wave2d_b.py @@ -64,7 +64,6 @@ # We can now write the PDE # pde = model.m * u.dt2 - u.laplace + model.damp * u.dt -# import pdb;pdb.set_trace() pde = u.dt2 - u.laplace stencil = Eq(u.forward, solve(pde, u.forward)) diff --git a/scripts/gen_sympy_funcs.py b/scripts/gen_sympy_funcs.py index 976ac6c8ee8..dab404a5672 100644 --- a/scripts/gen_sympy_funcs.py +++ b/scripts/gen_sympy_funcs.py @@ -5,8 +5,6 @@ import (DifferentiableOp, diffify)\n\n") for fn in funcs: - import pdb - pdb.set_trace() try: strc = """class %s(DifferentiableOp, sympy.%s): __sympy_class__ = sympy.%s