Skip to content

Commit b2aa9cf

Browse files
committed
build:docker build try fix
1 parent 53df05e commit b2aa9cf

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

excuter/op-mem-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
1212

1313
WORKDIR /home/
1414
# CUDA 已经预装,无需额外配置
15-
ADD common common
15+
ADD cpp-common cpp-common
1616
ADD op-mem-cuda op-mem-cuda
1717
WORKDIR /home/op-mem-cuda
1818

excuter/op-mem-ompsimd/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ target_link_libraries( deepx_ompsimd
5757
yaml-cpp
5858
${JEMALLOC_LIBRARIES}
5959
openblas
60-
# OpenBLAS
6160
OpenMP::OpenMP_CXX
6261
hwy
6362
)

excuter/op-mem-ompsimd/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@ RUN apt-get update && apt-get install -y \
1414

1515
# 安装 Highway SIMD 库
1616

17-
ADD . .
18-
RUN cd thirdlib/highway && \
17+
RUN mkdir -p thirdlib && \
18+
cd thirdlib && \
19+
git clone https://github.com/google/highway.git && \
20+
cd highway && \
1921
rm -rf build && mkdir build && cd build && \
2022
cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local && \
2123
make -j$(nproc) && make install && \
2224
cd ../../ && rm -rf thirdlib/highway
2325

24-
# 配置环境变量(参考代码块 `test/op/1_mem.cpp` startLine:16)
26+
ADD cpp-common cpp-common
27+
ADD op-mem-ompsimd op-mem-ompsimd
28+
WORKDIR /home/op-mem-ompsimd
29+
2530
RUN rm -rf build && mkdir build && cd build && \
2631
cmake ..&& \
2732
make -j$(nproc)
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
docker build -t docker.array2d.com/deepx/ompsimd:latest .
2-
docker push docker.array2d.com/deepx/ompsimd:latest
1+
cd ../
2+
pwd
3+
ls -al
4+
docker build -t docker.array2d.com/deepx/ompsimd:latest . -f op-mem-ompsimd/Dockerfile

0 commit comments

Comments
 (0)