Skip to content

Commit e7bb4ba

Browse files
HartornHartorn
committed
chore: update to 1.4
1 parent 80a184c commit e7bb4ba

File tree

5 files changed

+37
-30
lines changed

5 files changed

+37
-30
lines changed

‎build-dockerfiles.sh‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,19 @@ for python_version in "3.7" "3.8"; do
6464

6565
echo "Adding OneDNN to the dockerfile"
6666
echo "# Adding MKL-DNN (now OneDNN) to the image" >>"${output_file}"
67-
apt_install_temp_packages ${output_file} "${BUILD_PACKAGES}"
68-
echo "&& git clone https://github.com/01org/mkl-dnn.git -b ${ONE_DNN_VERSION} --depth 1 \\" >>"${output_file}"
69-
echo "&& cd mkl-dnn && mkdir -p build && cd build \\">>"${output_file}"
70-
echo "&& cmake .. \\">>"${output_file}"
71-
echo "&& make -j \\">>"${output_file}"
72-
echo "&& make install \\">>"${output_file}"
67+
apt_install_temp_packages ${output_file} "curl"
68+
# https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz
69+
echo "&& curl -L https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz -o dnnl.tgz \\" >>"${output_file}"
70+
echo "&& tar zxvf dnnl.tgz \\" >>"${output_file}"
71+
echo "&& mv dnnl_lnx_1.3.0_cpu_gomp/include/* /usr/local/include \\" >>"${output_file}"
72+
echo "&& mv dnnl_lnx_1.3.0_cpu_gomp/lib/* /usr/local/lib \\" >>"${output_file}"
73+
echo "&& rm dnnl.tgz && rm -r dnnl_lnx_1.3.0_cpu_gomp \\" >>"${output_file}"
74+
75+
# echo "&& git clone https://github.com/01org/mkl-dnn.git -b ${ONE_DNN_VERSION} --depth 1 \\" >>"${output_file}"
76+
# echo "&& cd mkl-dnn && mkdir -p build && cd build \\">>"${output_file}"
77+
# echo "&& cmake .. \\">>"${output_file}"
78+
# echo "&& make -j \\">>"${output_file}"
79+
# echo "&& make install \\">>"${output_file}"
7380
# echo "&& cd mkl-dnn/scripts && ./prepare_mkl.sh && cd .. \\" >>"${output_file}"
7481
# echo "&& mkdir -p build && cd build && cmake .. && make \\" >>"${output_file}"
7582
# echo "&& make install \\" >>"${output_file}"

‎dockerfiles/3.7/cpu/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ RUN apt update \
198198
# Adding MKL-DNN (now OneDNN) to the image
199199
RUN savedAptMark="$(apt-mark showmanual)" \
200200
&& apt update \
201-
&& apt install gcc g++ curl wget make cmake git gfortran -y --no-install-recommends \
202-
&& git clone https://github.com/01org/mkl-dnn.git -b v1.4 --depth 1 \
203-
&& cd mkl-dnn && mkdir -p build && cd build \
204-
&& cmake .. \
205-
&& make -j \
206-
&& make install \
201+
&& apt install curl -y --no-install-recommends \
202+
&& curl -L https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz -o dnnl.tgz \
203+
&& tar zxvf dnnl.tgz \
204+
&& mv dnnl_lnx_1.3.0_cpu_gomp/include/* /usr/local/include \
205+
&& mv dnnl_lnx_1.3.0_cpu_gomp/lib/* /usr/local/lib \
206+
&& rm dnnl.tgz && rm -r dnnl_lnx_1.3.0_cpu_gomp \
207207
&& apt-mark auto '.*' > /dev/null \
208208
&& apt-mark manual $savedAptMark \
209209
&& apt purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

‎dockerfiles/3.7/gpu/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ RUN apt update \
205205
# Adding MKL-DNN (now OneDNN) to the image
206206
RUN savedAptMark="$(apt-mark showmanual)" \
207207
&& apt update \
208-
&& apt install gcc g++ curl wget make cmake git gfortran -y --no-install-recommends \
209-
&& git clone https://github.com/01org/mkl-dnn.git -b v1.4 --depth 1 \
210-
&& cd mkl-dnn && mkdir -p build && cd build \
211-
&& cmake .. \
212-
&& make -j \
213-
&& make install \
208+
&& apt install curl -y --no-install-recommends \
209+
&& curl -L https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz -o dnnl.tgz \
210+
&& tar zxvf dnnl.tgz \
211+
&& mv dnnl_lnx_1.3.0_cpu_gomp/include/* /usr/local/include \
212+
&& mv dnnl_lnx_1.3.0_cpu_gomp/lib/* /usr/local/lib \
213+
&& rm dnnl.tgz && rm -r dnnl_lnx_1.3.0_cpu_gomp \
214214
&& apt-mark auto '.*' > /dev/null \
215215
&& apt-mark manual $savedAptMark \
216216
&& apt purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

‎dockerfiles/3.8/cpu/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ RUN apt update \
162162
# Adding MKL-DNN (now OneDNN) to the image
163163
RUN savedAptMark="$(apt-mark showmanual)" \
164164
&& apt update \
165-
&& apt install gcc g++ curl wget make cmake git gfortran -y --no-install-recommends \
166-
&& git clone https://github.com/01org/mkl-dnn.git -b v1.4 --depth 1 \
167-
&& cd mkl-dnn && mkdir -p build && cd build \
168-
&& cmake .. \
169-
&& make -j \
170-
&& make install \
165+
&& apt install curl -y --no-install-recommends \
166+
&& curl -L https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz -o dnnl.tgz \
167+
&& tar zxvf dnnl.tgz \
168+
&& mv dnnl_lnx_1.3.0_cpu_gomp/include/* /usr/local/include \
169+
&& mv dnnl_lnx_1.3.0_cpu_gomp/lib/* /usr/local/lib \
170+
&& rm dnnl.tgz && rm -r dnnl_lnx_1.3.0_cpu_gomp \
171171
&& apt-mark auto '.*' > /dev/null \
172172
&& apt-mark manual $savedAptMark \
173173
&& apt purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

‎dockerfiles/3.8/gpu/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ RUN apt update \
169169
# Adding MKL-DNN (now OneDNN) to the image
170170
RUN savedAptMark="$(apt-mark showmanual)" \
171171
&& apt update \
172-
&& apt install gcc g++ curl wget make cmake git gfortran -y --no-install-recommends \
173-
&& git clone https://github.com/01org/mkl-dnn.git -b v1.4 --depth 1 \
174-
&& cd mkl-dnn && mkdir -p build && cd build \
175-
&& cmake .. \
176-
&& make -j \
177-
&& make install \
172+
&& apt install curl -y --no-install-recommends \
173+
&& curl -L https://github.com/oneapi-src/oneDNN/releases/download/v1.3/dnnl_lnx_1.3.0_cpu_gomp.tgz -o dnnl.tgz \
174+
&& tar zxvf dnnl.tgz \
175+
&& mv dnnl_lnx_1.3.0_cpu_gomp/include/* /usr/local/include \
176+
&& mv dnnl_lnx_1.3.0_cpu_gomp/lib/* /usr/local/lib \
177+
&& rm dnnl.tgz && rm -r dnnl_lnx_1.3.0_cpu_gomp \
178178
&& apt-mark auto '.*' > /dev/null \
179179
&& apt-mark manual $savedAptMark \
180180
&& apt purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \

0 commit comments

Comments
 (0)