mirror of
https://github.com/rapidsai/cudf.git
synced 2021-11-08 00:24:56 +03:00
remove outdated channel setting in shell script, add docker arg to control development yaml
This commit is contained in:
@@ -6,6 +6,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/local/lib
|
||||
# Needed for cudf.concat(), avoids "OSError: library nvvm not found"
|
||||
ENV NUMBAPRO_NVVM=/usr/local/cuda/nvvm/lib64/libnvvm.so
|
||||
ENV NUMBAPRO_LIBDEVICE=/usr/local/cuda/nvvm/libdevice/
|
||||
ARG CUDA_REL=9.2
|
||||
|
||||
ARG CC=5
|
||||
ARG CXX=5
|
||||
@@ -52,12 +53,12 @@ ADD . /cudf/
|
||||
# the environment file based on versions set in build args
|
||||
RUN ls -la /cudf
|
||||
RUN if [ -f /cudf/docker/package_versions.sh ]; \
|
||||
then /cudf/docker/package_versions.sh /cudf/conda/environments/cudf_dev.yml && \
|
||||
conda env create --name cudf --file /cudf/conda/environments/cudf_dev.yml ; \
|
||||
then /cudf/docker/package_versions.sh /cudf/conda/environments/cudf_dev_cuda${CUDA_REL}.yml && \
|
||||
conda env create --name cudf --file /cudf/conda/environments/cudf_dev_cuda${CUDA_REL}.yml ; \
|
||||
else rm -rf /cudf && \
|
||||
git clone --recurse-submodules -b ${CUDF_BRANCH} ${CUDF_REPO} /cudf && \
|
||||
/cudf/docker/package_versions.sh /cudf/conda/environments/cudf_dev.yml && \
|
||||
conda env create --name cudf --file /cudf/conda/environments/cudf_dev.yml ; \
|
||||
/cudf/docker/package_versions.sh /cudf/conda/environments/cudf_dev_cuda${CUDA_REL}.yml && \
|
||||
conda env create --name cudf --file /cudf/conda/environments/cudf_dev_cuda${CUDA_REL}.yml ; \
|
||||
fi
|
||||
|
||||
# libcudf build/install
|
||||
|
||||
@@ -46,17 +46,6 @@ if [ "$CMAKE_VERSION" ]; then
|
||||
set_version "$PACKAGE_NAME" "$CMAKE_VERSION"
|
||||
fi
|
||||
|
||||
if [ "${CUDA_VERSION:0:3}" == "9.2" ]; then
|
||||
RAPIDS_CUDA_VERSION="9.2"
|
||||
elif [ "${CUDA_VERSION:0:4}" == "10.0" ]; then
|
||||
RAPIDS_CUDA_VERSION="10.0"
|
||||
fi
|
||||
|
||||
if [ "$RAPIDS_CUDA_VERSION" ]; then
|
||||
replace_text "nvidia" "nvidia\/label\/cuda$RAPIDS_CUDA_VERSION"
|
||||
replace_text "rapidsai" "rapidsai\/label\/cuda$RAPIDS_CUDA_VERSION"
|
||||
fi
|
||||
|
||||
if [ "$NUMPY_VERSION" ]; then
|
||||
ABOVE_PACKAGE="pandas"
|
||||
PACKAGE_NAME="numpy"
|
||||
|
||||
Reference in New Issue
Block a user