From 2c93ee5361189c9e9b782f35b844cee63f149253 Mon Sep 17 00:00:00 2001
From: Xingdong Zuo <zuoxingdong@hotmail.com>
Date: Tue, 14 May 2019 16:20:35 +0200
Subject: [PATCH] improve CI: use conda as much as possible for MKL
 optimization etc.

Former-commit-id: 6400596c2489cd63c88eff78eaf0960e467b06b3 [formerly 08d8ecd73dea6a4bd16ab55c40852ccfaf1f579f]
Former-commit-id: f8c4120c5fe27712d50c3e82db0839618609f1f5
---
 .circleci/config.yml           |  3 ++-
 requirements.txt               | 33 ++-------------------------------
 scripts/2_install_miniconda.sh |  4 ++--
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6686d0b9..760c7e16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,8 @@ jobs:  # Build-Test-Deplot (BTD) process
                     bash 3_setup_envs.sh 
                     cd ..
                     pip install -q mock
-                    pip install -q torch_nightly -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+                    #pip install -q torch_nightly -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+                    conda install -q -y pytorch-nightly-cpu -c pytorch
                     # Install current project
                     pip install -e .
             
diff --git a/requirements.txt b/requirements.txt
index da99afff..c60c849d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,49 +1,20 @@
-# Update: 2019-05-07
-
-# System-related
-mkl>=2019.0
-mkl-include>=2019.0
-cmake>=3.13.3
-cython>=0.29.7
-cffi>=1.12.3
-typing>=3.6.6
-msgpack>=0.6.1
-setuptools>=41.0.1
-wheel>=0.33.1
-twine>=1.13.0
+# Update: 2019-05-14
 
 # Common
 jupyterlab>=1.0.0a3
-numpy>=1.16.3
-scipy>=1.2.1
-pandas>=0.24.2
-cloudpickle>=1.0.0
-pyyaml>=5.1
 colored>=1.3.93
 lz4>=2.1.6
 
 # Testing, PEP8 code quality
-pytest>=4.4.1
+pytest>=4.5.0
 flake8>=3.7.7
 
 # Image, Video
-scikit-image>=0.15.0
-scikit-learn>=0.20.3
-pillow>=6.0.0
-imageio>=2.5.0
 pyglet>=1.3.2
 opencv-python>=4.1.0.25
 
-# Plotting
-matplotlib>=3.0.3
-seaborn>=0.9.0
-
 # RL
 atari_py>=0.1.7
 #gym>=0.12.1  # revert when gym update version with latest TimeLimit
 git+https://github.com/openai/gym.git
 cma>=2.7.0
-
-# ReadtheDocs
-sphinx>=2.0.1
-sphinx_rtd_theme>=0.4.3
diff --git a/scripts/2_install_miniconda.sh b/scripts/2_install_miniconda.sh
index febff5e3..32f1836b 100755
--- a/scripts/2_install_miniconda.sh
+++ b/scripts/2_install_miniconda.sh
@@ -28,8 +28,8 @@ conda update -q -y conda
 conda update -y --all
 conda info -a
 
-# Create and activate an environment with latest Python
-conda create -q -y -n $ENV_NAME python=$PYTHON_VERSION cython patchelf ipython numpy
+# Create and activate an environment with latest Python and useful packages
+conda create -q -y -n $ENV_NAME python=$PYTHON_VERSION mkl mkl-include cmake cython cffi typing patchelf msgpack-python setuptools wheel twine cloudpickle pyyaml ipython numpy scipy pandas scikit-image scikit-learn seaborn matplotlib pillow imageio sphinx sphinx_rtd_theme
 conda activate $ENV_NAME
 
 # Append environment variables to .bashrc