Skip to content

Commit 1a6f24a

Browse files
QPod0QPod0
authored andcommitted
add nomkl for paddle
1 parent 0b2fc79 commit 1a6f24a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ jobs:
263263
- uses: actions/checkout@v2
264264
- run: |
265265
source ./tool.sh
266-
build_image paddle-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=paddle"
266+
build_image paddle-cuda116 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_11.6" --build-arg "ARG_PROFILE_PYTHON=paddle,nomkl"
267267
alias_image paddle-cuda116 latest paddle latest
268268
push_image
269269
@@ -275,7 +275,7 @@ jobs:
275275
- uses: actions/checkout@v2
276276
- run: |
277277
source ./tool.sh
278-
build_image paddle-cuda102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=paddle"
278+
build_image paddle-cuda102 latest docker_core/Dockerfile --build-arg "BASE_IMG=cuda_10.2" --build-arg "ARG_PROFILE_PYTHON=paddle,nomkl"
279279
push_image
280280
281281

docker_core/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ RUN source /opt/utils/script-utils.sh \
4444
RUN source /opt/utils/script-setup.sh \
4545
&& for profile in $(echo $ARG_PROFILE_R | tr "," "\n") ; do ( setup_R_${profile} ) ; done
4646

47-
# If on a x86_64 architecture and install data science pkgs, install MKL for acceleration; Installing conda packages if provided.
48-
RUN $(grep -q "x86_64" <<< `arch`) && $(grep -q "datascience" <<< "${ARG_PROFILE_PYTHON}") && ( echo "mkl" >> /opt/utils/install_list.conda ) || echo "Skip MLK install." \
47+
# If on a x86_64 architecture: 1) if install data science pkgs, install MKL for acceleration; 2) If nomkl specified, install nomkl; 3) Installing conda packages as specified.
48+
RUN $(grep -q "x86_64" <<< `arch`) && ( \
49+
( $(grep -q "datascience" <<< "${ARG_PROFILE_PYTHON}") && ( echo "mkl" >> /opt/utils/install_list.conda ) || echo "Skip MLK install." ) \
50+
&& ( $(grep -q "nomkl" <<< "${ARG_PROFILE_PYTHON}") && ( echo "nomkl" >> /opt/utils/install_list.conda ) || echo "Skip nomkl setup." ) \
51+
) \
4952
&& source /opt/utils/script-utils.sh && install_conda /opt/utils/install_list_core.conda
5053

5154
# If installing Python packages

0 commit comments

Comments
 (0)