diff --git a/conda/Dockerfile.template b/conda/Dockerfile.template index f38b169f16129..1b5dc6fbef5e0 100644 --- a/conda/Dockerfile.template +++ b/conda/Dockerfile.template @@ -35,7 +35,8 @@ RUN curl -o ~/miniconda.sh -O https://repo.continuum.io/miniconda/Miniconda3-lat /opt/conda/bin/conda install conda-build conda-verify && \ /opt/conda/bin/conda clean -ya -RUN /opt/conda/bin/conda install --download-only cmake make llvmdev=7.0.0 zlib +RUN /opt/conda/bin/conda install --download-only cmake make zlib +RUN /opt/conda/bin/conda install --download-only -c numba llvmdev=8.0.0 ENV PATH /opt/conda/bin:$PATH ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64 diff --git a/conda/build_cpu.sh b/conda/build_cpu.sh index e53d91d486903..4b2dcb72fbd41 100755 --- a/conda/build_cpu.sh +++ b/conda/build_cpu.sh @@ -26,5 +26,5 @@ touch /tmp/.conda/pkgs/urls.txt touch /tmp/.conda/environments.txt -conda build --output-folder=conda/pkg conda/tvm-libs +conda build --output-folder=conda/pkg -c numba conda/tvm-libs conda build --output-folder=conda/pkg -m conda/conda_build_config.yaml conda/tvm diff --git a/conda/build_cuda.sh b/conda/build_cuda.sh index 2061b85229bb1..a8a15c3782478 100755 --- a/conda/build_cuda.sh +++ b/conda/build_cuda.sh @@ -26,4 +26,4 @@ touch /tmp/.conda/pkgs/urls.txt touch /tmp/.conda/environments.txt -conda build --output-folder=conda/pkg --variants "{cuda: True, cuda_version: ${CUDA_VERSION%.*}}" conda/tvm-libs +conda build --output-folder=conda/pkg --variants "{cuda: True, cuda_version: ${CUDA_VERSION%.*}}" -c numba conda/tvm-libs diff --git a/conda/tvm-libs/build.sh b/conda/tvm-libs/build.sh index 92800ff6f2f92..96355ac38a458 100644 --- a/conda/tvm-libs/build.sh +++ b/conda/tvm-libs/build.sh @@ -21,16 +21,14 @@ set -e if [ "$target_platform" == "osx-64" ]; then # macOS 64 bits METAL_OPT="" # Conda can only target 10.9 for now - TOOLCHAIN_OPT="" + TOOLCHAIN_OPT="-DCMAKE_OSX_SYSROOT=\"${CONDA_BUILD_SYSROOT}\"" else METAL_OPT="" if [ "$target_platform" == "linux-64" ]; then # Linux 64 bits TOOLCHAIN_OPT="-DCMAKE_TOOLCHAIN_FILE=${RECIPE_DIR}/../cross-linux.cmake" - else - # Windows (or 32 bits, which we don't support) - TOOLCHAIN_OPT="" fi + # We don't support other platforms (linux-32 or windows) fi if [ "$cuda" == "True" ]; then diff --git a/conda/tvm-libs/meta.yaml b/conda/tvm-libs/meta.yaml index 4d910cabf3bd0..f9bdb5183c7aa 100644 --- a/conda/tvm-libs/meta.yaml +++ b/conda/tvm-libs/meta.yaml @@ -36,7 +36,7 @@ requirements: - cmake - make host: - - llvmdev ==7.0.0 + - llvmdev ==8.0.0 - zlib # [linux] run: - {{ pin_compatible('cudatoolkit', lower_bound=cuda_version, max_pin='x.x') }} # [cuda] diff --git a/docker/Dockerfile.conda_cuda100 b/docker/Dockerfile.conda_cuda100 index bf022a6940c72..d6e1cddbfd373 100644 --- a/docker/Dockerfile.conda_cuda100 +++ b/docker/Dockerfile.conda_cuda100 @@ -35,7 +35,8 @@ RUN curl -o ~/miniconda.sh -O https://repo.continuum.io/miniconda/Miniconda3-lat /opt/conda/bin/conda install conda-build conda-verify && \ /opt/conda/bin/conda clean -ya -RUN /opt/conda/bin/conda install --download-only cmake make llvmdev=7.0.0 zlib +RUN /opt/conda/bin/conda install --download-only cmake make zlib +RUN /opt/conda/bin/conda install --download-only -c numba llvmdev=8.0.0 ENV PATH /opt/conda/bin:$PATH ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64 diff --git a/docker/Dockerfile.conda_cuda90 b/docker/Dockerfile.conda_cuda90 index 320e14bdc08ae..f55aa1bf2e126 100644 --- a/docker/Dockerfile.conda_cuda90 +++ b/docker/Dockerfile.conda_cuda90 @@ -35,7 +35,8 @@ RUN curl -o ~/miniconda.sh -O https://repo.continuum.io/miniconda/Miniconda3-lat /opt/conda/bin/conda install conda-build conda-verify && \ /opt/conda/bin/conda clean -ya -RUN /opt/conda/bin/conda install --download-only cmake make llvmdev=7.0.0 zlib +RUN /opt/conda/bin/conda install --download-only cmake make zlib +RUN /opt/conda/bin/conda install --download-only -c numba llvmdev=8.0.0 ENV PATH /opt/conda/bin:$PATH ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64