Skip to content

Commit

Permalink
Merge pull request #189 from zuoxingdong/new_CI
Browse files Browse the repository at this point in the history
improve CI: use conda as much as possible for MKL optimization etc.

Former-commit-id: 326c2556d6faa1c11bc8fb3cd8de018c11ff945e [formerly 57ee3a713f535c48f0802e5dc4e0c2fb58be703a]
Former-commit-id: 5bd255dd22069eb382ec139b75ef364f28a0fbe9
  • Loading branch information
zuoxingdong authored May 14, 2019
2 parents c83f359 + 812df5d commit cff9fdc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ 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
conda install -q -y pytorch-nightly-cpu -c pytorch
# Install current project
pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install:
- 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
- conda install -q -y pytorch-nightly-cpu -c pytorch
# Install current project
- pip install -e .
script:
Expand Down
33 changes: 2 additions & 31 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions scripts/2_install_miniconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cff9fdc

Please sign in to comment.