From c41e821467e1ef6acb9b41cf20ae515288be7988 Mon Sep 17 00:00:00 2001 From: Edward Caunt Date: Wed, 4 Mar 2026 16:11:33 +0000 Subject: [PATCH 1/2] misc: Remove decrepit singularity def file --- docker/Singularity.nvidia.def | 163 ---------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 docker/Singularity.nvidia.def diff --git a/docker/Singularity.nvidia.def b/docker/Singularity.nvidia.def deleted file mode 100644 index 3530a0016b..0000000000 --- a/docker/Singularity.nvidia.def +++ /dev/null @@ -1,163 +0,0 @@ -Bootstrap: docker -From: python:3.8 - -%help -############################################################## -# This Dockerfile contains the additional NVIDIA compilers, -# libraries, and plugins to enable OpenACC and NVIDIA GPU -# acceleration of Devito codes. -# -# BUILD: -# singularity build --fakeroot devito.nvidia.sif docker/Singularity.nvidia.def -# -# RUN: -# singularity run --nv --writable-tmpfs devito.nvidia.sif -############################################################## - -%files -./requirements.txt /app/requirements.txt -./requirements-optional.txt /app/requirements-optional.txt -./requirements-nvidia.txt /app/requirements-nvidia.txt -./requirements-mpi.txt /app/requirements-mpi.txt -./devito /app/devito -./tests /app/tests -./scripts /app/scripts -./examples /app/examples -./benchmarks /app/benchmarks -setup.cfg /app/ -docker/run-jupyterlab.sh /jupyter -docker/run-tests.sh /tests -docker/run-print-defaults.sh /print-defaults -docker/entrypoint.sh /entrypoint.sh -docker/nvdashboard.json /app/nvdashboard.json - -%environment -export NVIDIA_VISIBLE_DEVICES=all -export NVIDIA_DRIVER_CAPABILITIES=compute,utility - -export HPCSDK_HOME=/opt/nvidia/hpc_sdk/Linux_x86_64/2022 -export HPCSDK_CUPTI=/opt/nvidia/hpc_sdk/Linux_x86_64/2022/cuda/11.6/extras/CUPTI -export NVCOMP_EXTS_ROOT=/app/nvcomp_exts/ubuntu18.04/11.6 -export bitcomp_DIR=$NVCOMP_EXTS_ROOT/lib/ - -export CUDA_HOME=$HPCSDK_HOME/cuda -export NVHPC_CUDA_HOME=$HPCSDK_HOME/cuda -export CUDA_ROOT=$HPCSDK_HOME/cuda/bin -export PATH=$HPCSDK_HOME/compilers/bin:$HPCSDK_HOME/cuda/bin:$HPCSDK_HOME/comm_libs/mpi/bin:${PATH} -export LD_LIBRARY_PATH=$HPCSDK_HOME/cuda/lib:$HPCSDK_HOME/cuda/lib64:$HPCSDK_HOME/compilers/lib:$HPCSDK_HOME/math_libs/lib64:$HPCSDK_HOME/comm_libs/mpi/lib:$HPCSDK_CUPTI/lib64:bitcomp_DIR:${LD_LIBRARY_PATH} - -# entrypoint.sh in docker, but need to add in build for singularity -export PATH=/venv/bin:${PATH} -export PYTHONPATH=/app:${PYTHONPATH} - -export OMPI_ALLOW_RUN_AS_ROOT=1 -export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 -export OMPI_MCA_rmaps_base_oversubscribe=1 -export OMPI_MCA_btl_base_warn_component_unused=0 -export UCX_MEMTYPE_CACHE=no -export UCX_MEMTYPE_CACHE=no -export UCX_NET_DEVICES=all -export UCX_SHM_DEVICES=all -export UCX_ACC_DEVICES=all -export NCCL_UCX_RNDV_THRESH=0 -export NCCL_UCX_RNDV_SCHEME=get_zcopy -export NCCL_PLUGIN_P2P=ucx -export MELLANOX_MOUNT_DRIVER=1 - -export UCX_TLS=rc_x,sm,shm,cuda_copy,gdr_copy,cuda_ipc -#For virtual environments and cloud -#export UCX_TLS=sm,shm,cuda_copy,cuda_ipc - -## Environment Variables for OpenACC Builds -# Reference: https://github.com/devitocodes/devito/wiki/FAQ #can-i-manually-modify-the-c-code-generated-by-devito-and -export DEVITO_ARCH="nvc" -export DEVITO_LANGUAGE="openacc" -export DEVITO_PLATFORM=nvidiaX - -# Options: [unset, 1] For PGI openacc; Should only be set after a first execution of the benchmark -# export DEVITO_JIT_BACKDOOR=1 - -# Enable logging, Options: [unset, PERF, DEBUG] -export DEVITO_LOGGING=DEBUG -#export PGI_ACC_TIME=1 - -# Set the home directory to our app user's home. -export HOME=/app -export APP_HOME=/app - -%post -c /bin/bash - -export DEBIAN_FRONTEND=noninteractive - -# nodesource: nvdashboard requires nodejs>=10 -echo 'deb [trusted=yes] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' > /etc/apt/sources.list.d/nvhpc.list && \ -apt-get update -y && \ -apt-get install -y -q \ - apt-utils curl\ - vim && \ -curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ -apt-get install -y -q \ - nodejs \ - liblapack-dev \ - libblas-dev \ - libibverbs-dev libmlx4-1 libmlx5-1 ibutils \ - texlive-latex-extra texlive-fonts-recommended dvipng cm-super \ - ffmpeg \ - nvhpc-22-2 nvhpc-22-2-cuda-multi && \ -wget -q -P /app/nvcomp_exts/ \ - http://developer.download.nvidia.com/compute/nvcomp/2.2/local_installers/nvcomp_exts_x86_64_ubuntu18.04-2.2.tar.gz && \ -tar -xvf /app/nvcomp_exts/nvcomp_exts_x86_64_ubuntu18.04-2.2.tar.gz -C /app/nvcomp_exts && \ -apt-get update -y && \ -rm -rf /app/nvcomp_exts/nvcomp* && \ -rm -rf /var/lib/apt/lists/* - -export HPCSDK_HOME=/opt/nvidia/hpc_sdk/Linux_x86_64/2022 -export HPCSDK_CUPTI=/opt/nvidia/hpc_sdk/Linux_x86_64/2022/cuda/11.6/extras/CUPTI - -# Compiler, CUDA, and Library paths -export CUDA_HOME=$HPCSDK_HOME/cuda -export NVHPC_CUDA_HOME=$HPCSDK_HOME/cuda -export CUDA_ROOT=$HPCSDK_HOME/cuda/bin -export PATH=$HPCSDK_HOME/compilers/bin:$HPCSDK_HOME/cuda/bin:$HPCSDK_HOME/comm_libs/mpi/bin:${PATH} -export LD_LIBRARY_PATH=$HPCSDK_HOME/cuda/lib:$HPCSDK_HOME/cuda/lib64:$HPCSDK_HOME/compilers/lib:$HPCSDK_HOME/math_libs/lib64:$HPCSDK_HOME/comm_libs/mpi/lib:$HPCSDK_CUPTI/lib64:${LD_LIBRARY_PATH} - -python3 -m venv /venv && \ - /venv/bin/pip install --no-cache-dir --upgrade pip && \ - /venv/bin/pip install --no-cache-dir wheel && \ - /venv/bin/pip install --no-cache-dir -r /app/requirements.txt && \ - /venv/bin/pip install --no-cache-dir -r /app/requirements-optional.txt && \ - /venv/bin/pip install --no-cache-dir -r /app/requirements-nvidia.txt && \ - rm -rf ~/.cache/pip - -# MPI ROOT USER DEFAULTS -export CPATH=$HPCSDK_HOME/comm_libs/mpi/include:${CPATH} -export CFLAGS=-noswitcherror - -#MPI 3 -# Do Nothing -#MPI 4 -#rm -f $HPCSDK_HOME/comm_libs/mpi && \ -#ln -sf $HPCSDK_HOME/comm_libs/openmpi4/openmpi-4.0.5 $HPCSDK_HOME/comm_libs/mpi ; -#HPCX -rm -f $HPCSDK_HOME/comm_libs/mpi && \ -ln -sf $HPCSDK_HOME/comm_libs/hpcx/latest/ompi $HPCSDK_HOME/comm_libs/mpi ; - -/venv/bin/pip install --no-cache-dir -r /app/requirements-mpi.txt && \ -rm -rf ~/.cache/pip -export CFLAGS= - -chmod -R 755 /app -chmod 777 /app -chmod 777 /print-defaults /jupyter /tests /entrypoint.sh && \ - /venv/bin/jupyter serverextension enable dask_labextension -# /venv/bin/jupyter lab workspaces import /app/nvdashboard.json - -%runscript -echo /jupyter "$@" -cd /app -exec /jupyter "$@" - -%startscript -cd /app - -%test From 70c32b4f14b05ad32286d7b6883b605296d124cc Mon Sep 17 00:00:00 2001 From: Edward Caunt Date: Wed, 4 Mar 2026 16:21:28 +0000 Subject: [PATCH 2/2] misc: Fix typos in notebook --- examples/userapi/05_conditional_dimension.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/userapi/05_conditional_dimension.ipynb b/examples/userapi/05_conditional_dimension.ipynb index 91cb9cdda8..f0a7a1b531 100644 --- a/examples/userapi/05_conditional_dimension.ipynb +++ b/examples/userapi/05_conditional_dimension.ipynb @@ -831,13 +831,13 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# Example C: Combining ConditionaDimension\n", + "# Example C: Combining ConditionalDimension\n", "\n", - "In some cases, a `ConditionaDimension` might be used in combination with an implicit_dim to handle specific cases. This combination can be made mutually exclusive (And) or inclusive (Or).\n", + "In some cases, a `ConditionalDimension` might be used in combination with an implicit_dim to handle specific cases. This combination can be made mutually exclusive (And) or inclusive (Or).\n", "\n", "As an example, let's consider the following case:\n", "\n", - "- Set all even x indices to 1 using the standard subsampling `factor` ConditionaDimension\n", + "- Set all even x indices to 1 using the standard subsampling `factor` ConditionalDimension\n", "- Set the edges to 2" ] },