diff --git a/ci/docker_images/ubuntu/jammy_cuda/Dockerfile b/ci/docker_images/ubuntu/jammy_cuda/Dockerfile index 10f34b57f985d95e6ef29bc627c808d31e2ed081..2ee796fd1eacfd04e5df5875868860c6c61cf5f0 100644 --- a/ci/docker_images/ubuntu/jammy_cuda/Dockerfile +++ b/ci/docker_images/ubuntu/jammy_cuda/Dockerfile @@ -224,10 +224,6 @@ RUN ${PYTHON_EXECUTABLE} -m pip install ansicolors --ignore-installed RUN ${PYTHON_EXECUTABLE} -m pip install numpy==1.21.5 RUN ${PYTHON_EXECUTABLE} -m pip install sympy==1.10.0 -# windows is missing libnvidia-opencl.so so we copy it from there -RUN cd /lib/x86_64-linux-gnu \ - && wget https://cloud.univ-grenoble-alpes.fr/s/HHoMSeTgHgZ3x7H/download/libnvidia-opencl.so.1 - # ensure all libraries are known by the runtime linker RUN ldconfig diff --git a/ci/utils/build_docker_image.bat b/ci/utils/build_docker_image.bat index d0dce81d1b086b9ba0d0674bbde022dc06e4ebf7..f37cb364f834b9d9e39b42ac4a47ab25f02ecc0c 100755 --- a/ci/utils/build_docker_image.bat +++ b/ci/utils/build_docker_image.bat @@ -1,7 +1,7 @@ pushd %~dp0 -set SCRIPT_DIR=%CD% +set "SCRIPT_DIR=%CD%" popd -set NTHREADS=%NUMBER_OF_PROCESSORS% -set HYSOP_REGISTRY_URL='gricad-registry.univ-grenoble-alpes.fr' -if "%~1" NEQ "" set DOCKER_IMAGE_TAG="%~1" else set DOCKER_IMAGE_TAG="jammy" -docker "build" "--rm=true" "--build-arg" "NTHREADS=%NTHREADS%" "-t" "%HYSOP_REGISTRY_URL%\particle_methods\hysop:%DOCKER_IMAGE_TAG%" "-f" "%SCRIPT_DIR%\..\docker_images\ubuntu\%DOCKER_IMAGE_TAG%\Dockerfile" "%SCRIPT_DIR%\..\.." +set "NTHREADS=%NUMBER_OF_PROCESSORS%" +set "HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr" +if "%~1" NEQ "" (set "DOCKER_IMAGE_TAG=%~1") else (set "DOCKER_IMAGE_TAG=jammy") +docker build --rm=true --build-arg "NTHREADS=%NTHREADS%" -t "%HYSOP_REGISTRY_URL%/particle_methods/hysop:%DOCKER_IMAGE_TAG%" -f "%SCRIPT_DIR%\..\docker_images\ubuntu\%DOCKER_IMAGE_TAG%\Dockerfile" "%SCRIPT_DIR%\..\.." diff --git a/ci/utils/pull_docker_image.bat b/ci/utils/pull_docker_image.bat index e95513ede793f6b07f21f67f7d0bd880d9fba737..280c1416e0079afdc5899a0abc27582e65a4d3ce 100755 --- a/ci/utils/pull_docker_image.bat +++ b/ci/utils/pull_docker_image.bat @@ -1,11 +1,10 @@ pushd %~dp0 -set SCRIPT_DIR=%CD% +set "SCRIPT_DIR=%CD%" popd -set NTHREADS=%NUMBER_OF_PROCESSORS% -set HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr +set "HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr" -if "%~1" NEQ "" (set DOCKER_IMAGE_TAG=%~1) else (set DOCKER_IMAGE_TAG=jammy) +if "%~1" NEQ "" (set "DOCKER_IMAGE_TAG=%~1") else (set "DOCKER_IMAGE_TAG=jammy") docker logout docker login "%HYSOP_REGISTRY_URL%" diff --git a/ci/utils/run_docker_image.bat b/ci/utils/run_docker_image.bat index 24200c767ed76dade0aa3688ab2ff514dd55d510..fc1e8eb374ce33b204780daac03d55e69296645b 100755 --- a/ci/utils/run_docker_image.bat +++ b/ci/utils/run_docker_image.bat @@ -1,8 +1,8 @@ pushd %~dp0 -set SCRIPT_DIR=%CD% +set "SCRIPT_DIR=%CD%" popd -set HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr -if "%~1" NEQ "" (set DOCKER_IMAGE_TAG=%~1) else (set DOCKER_IMAGE_TAG=jammy) +set "HYSOP_REGISTRY_URL=gricad-registry.univ-grenoble-alpes.fr" +if "%~1" NEQ "" (set "DOCKER_IMAGE_TAG=%~1") else (set "DOCKER_IMAGE_TAG=jammy") set "DOCKER_IMAGE_TAG_POSTFIX=%DOCKER_IMAGE_TAG:~-4%" if "%DOCKER_IMAGE_TAG_POSTFIX%" == "cuda" (set "EXTRA_ARGS=--gpus all") else (set "EXTRA_ARGS=") docker run %EXTRA_ARGS% -it -v "%SCRIPT_DIR%\..\..:/hysop:ro" "%HYSOP_REGISTRY_URL%/particle_methods/hysop:%DOCKER_IMAGE_TAG%"