|
@@ -3,7 +3,8 @@
|
|
|
# ==============================================================================
|
|
# ==============================================================================
|
|
|
|
|
|
|
|
# Define the CANN base image for easier version updates later
|
|
# Define the CANN base image for easier version updates later
|
|
|
-ARG CANN_BASE_IMAGE=quay.io/ascend/cann:8.1.rc1-910b-openeuler22.03-py3.10
|
|
|
|
|
|
|
+ARG CHIP_TYPE=910b
|
|
|
|
|
+ARG CANN_BASE_IMAGE=quay.io/ascend/cann:8.3.rc1.alpha001-${CHIP_TYPE}-openeuler22.03-py3.11
|
|
|
|
|
|
|
|
# ==============================================================================
|
|
# ==============================================================================
|
|
|
# BUILD STAGE
|
|
# BUILD STAGE
|
|
@@ -11,9 +12,6 @@ ARG CANN_BASE_IMAGE=quay.io/ascend/cann:8.1.rc1-910b-openeuler22.03-py3.10
|
|
|
# ==============================================================================
|
|
# ==============================================================================
|
|
|
FROM ${CANN_BASE_IMAGE} AS build
|
|
FROM ${CANN_BASE_IMAGE} AS build
|
|
|
|
|
|
|
|
-# Define the Ascend chip model for compilation. Default is Ascend910B3
|
|
|
|
|
-ARG ASCEND_SOC_TYPE=Ascend910B3
|
|
|
|
|
-
|
|
|
|
|
# -- Install build dependencies --
|
|
# -- Install build dependencies --
|
|
|
RUN yum install -y gcc g++ cmake make git libcurl-devel python3 python3-pip && \
|
|
RUN yum install -y gcc g++ cmake make git libcurl-devel python3 python3-pip && \
|
|
|
yum clean all && \
|
|
yum clean all && \
|
|
@@ -36,13 +34,14 @@ ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/runtime/lib64/stub:$LD_LIBRARY_PATH
|
|
|
# For brevity, only core variables are listed here. You can paste the original ENV list here.
|
|
# For brevity, only core variables are listed here. You can paste the original ENV list here.
|
|
|
|
|
|
|
|
# -- Build llama.cpp --
|
|
# -- Build llama.cpp --
|
|
|
-# Use the passed ASCEND_SOC_TYPE argument and add general build options
|
|
|
|
|
|
|
+# Use the passed CHIP_TYPE argument and add general build options
|
|
|
|
|
+ARG CHIP_TYPE
|
|
|
RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh --force \
|
|
RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh --force \
|
|
|
&& \
|
|
&& \
|
|
|
cmake -B build \
|
|
cmake -B build \
|
|
|
-DGGML_CANN=ON \
|
|
-DGGML_CANN=ON \
|
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
|
- -DSOC_TYPE=${ASCEND_SOC_TYPE} \
|
|
|
|
|
|
|
+ -DSOC_TYPE=ascend${CHIP_TYPE} \
|
|
|
. && \
|
|
. && \
|
|
|
cmake --build build --config Release -j$(nproc)
|
|
cmake --build build --config Release -j$(nproc)
|
|
|
|
|
|