This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
[MXNET-908] Enable minimal OSX Travis build (v1.3.x) #13179
Closed
Closed
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,108 +1,32 @@ | ||
sudo: false | ||
sudo: true | ||
|
||
language: cpp | ||
|
||
cache: ccache | ||
|
||
os: | ||
# - linux | ||
- osx | ||
|
||
osx_image: xcode8 | ||
|
||
env: | ||
# code analysis | ||
# - TASK=lint | ||
# build mxnet.so with CUDA | ||
# - TASK=build | ||
# run tests/cpp | ||
- TASK=cpp_test | ||
# run tests/python | ||
- TASK=python_test | ||
- TASK=r_test | ||
# - TASK=julia JULIA_VER=0.4 | ||
# - TASK=scala_test | ||
|
||
# TODO, R test, distributed test, clang, more g++ versions | ||
osx_image: xcode9.4 | ||
|
||
matrix: | ||
include: | ||
- # os: linux | ||
# dist: trusty | ||
# env: TASK=perl_test | ||
- os: osx | ||
## sudo is required because | ||
## prexexisting packages conflict | ||
## with new ones. | ||
## would be nice to have macports | ||
## on travis osx, it has all needed perl packages | ||
sudo: required | ||
env: TASK=perl_test | ||
# env: TASK=julia JULIA_VER=0.4 | ||
# - os: linux | ||
# env: TASK=build | ||
# - os: linux | ||
# env: TASK=cpp_test | ||
# - os: linux | ||
# env: TASK=python_test | ||
# - os: linux | ||
# env: TASK=r_test | ||
# - os: linux | ||
# env: TASK=scala_test | ||
|
||
# dependent apt packages | ||
addons: | ||
apt: | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
packages: | ||
- doxygen | ||
- wget | ||
- git | ||
- libcurl4-openssl-dev | ||
- unzip | ||
- libatlas-dev | ||
- libopencv-dev | ||
- gcc-4.8 | ||
- g++-4.8 | ||
- python-numpy | ||
- python-nose | ||
- python3-numpy | ||
- python3-dev | ||
- python3-nose | ||
- python-h5py | ||
- python3-h5py | ||
- graphviz | ||
- libmouse-perl | ||
- pdl | ||
- cpanminus | ||
- swig | ||
- libgraphviz-perl | ||
|
||
before_install: | ||
- export NVCC_PREFIX=${HOME} | ||
- source dmlc-core/scripts/travis/travis_setup_env.sh | ||
- export PYTHONPATH=${PYTHONPATH}:${PWD}/python | ||
- export MAVEN_SKIP_RC=true | ||
- export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=256m -XX:-UseGCOverheadLimit -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC" | ||
|
||
install: | ||
- source tests/travis/setup.sh | ||
|
||
- brew install ccache | ||
- export PATH="/usr/local/opt/ccache/libexec:$PATH" | ||
- source ci/travis/install.sh | ||
|
||
# We build with 2 concurrent jobs to match the number of cores present on MacOS virutal machines. | ||
# nproc does not report the correct number of cores reliably in Travis, so using nproc is not | ||
# recommended. | ||
# https://docs.travis-ci.com/user/reference/overview/ | ||
script: | ||
- tests/travis/run_test.sh | ||
|
||
cache: | ||
directories: | ||
- ${HOME}/.cache/usr | ||
|
||
before_cache: | ||
- dmlc-core/scripts/travis/travis_before_cache.sh | ||
|
||
after_failure: | ||
- tests/travis/travis_after_failure.sh | ||
|
||
notifications: | ||
# Emails are sent to the committer's git-configured email address by default, | ||
email: | ||
on_success: change | ||
on_failure: always | ||
#slack: dmlc:NmroCzntCiWOuxUZpii40USd | ||
- export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 | ||
- mv make/osx.mk config.mk | ||
- make -j 2 | ||
- python -m nose --verbose tests/python/unittest/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,7 +60,7 @@ class LibraryInitializer { | |
// Make children single threaded since they are typically workers | ||
dmlc::SetEnv("MXNET_CPU_WORKER_NTHREADS", 1); | ||
dmlc::SetEnv("OMP_NUM_THREADS", 1); | ||
#if MXNET_USE_OPENCV | ||
#if MXNET_USE_OPENCV && !__APPLE__ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the reason for not disabling opencv threads on mac? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @KellenSunderland do you know why this is done? As said previously, my task here was to port commits from master to the release branch and make only necessary changes. |
||
cv::setNumThreads(0); // disable opencv threading | ||
#endif // MXNET_USE_OPENCV | ||
engine::OpenMP::Get()->set_enabled(false); | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CMake?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to modify code for now, just porting things.