From 21467ad394c57735b67042293036fe71642dfd70 Mon Sep 17 00:00:00 2001 From: Priya Goyal Date: Mon, 1 Mar 2021 16:51:05 -0800 Subject: [PATCH] Apply bottlers changes from PR208 --- dev/packaging/vissl_conda/build_conda.sh | 4 +++- dev/packaging/vissl_conda/vissl/meta.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/packaging/vissl_conda/build_conda.sh b/dev/packaging/vissl_conda/build_conda.sh index 5f1ea3141..86190ca39 100644 --- a/dev/packaging/vissl_conda/build_conda.sh +++ b/dev/packaging/vissl_conda/build_conda.sh @@ -13,4 +13,6 @@ export BUILD_VERSION=$build_version # We allow the vissl channel to get the apex package. # We specify it with a full url to avoid a name clash with a local directory called vissl. -conda build -c https://conda.anaconda.org/vissl -c iopath -c conda-forge -c pytorch -c defaults --no-anaconda-upload --python "$PYTHON_VERSION" --output-folder "$packaging/out" "$packaging/vissl" +# Having defaults before conda-forge is so that the tensorboard used in the +# tests will work. +conda build -c https://conda.anaconda.org/vissl -c iopath -c pytorch -c defaults -c conda-forge --no-anaconda-upload --python "$PYTHON_VERSION" --output-folder "$packaging/out" "$packaging/vissl" diff --git a/dev/packaging/vissl_conda/vissl/meta.yaml b/dev/packaging/vissl_conda/vissl/meta.yaml index e27772eb5..d327825a5 100644 --- a/dev/packaging/vissl_conda/vissl/meta.yaml +++ b/dev/packaging/vissl_conda/vissl/meta.yaml @@ -43,6 +43,8 @@ test: requires: - ca-certificates - cudatoolkit=10.1 + - opencv + - tensorboard commands: - python -m unittest discover -v -s tests - ./dev/run_quick_tests.sh