Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Cleanup compilations & tests #5309

Merged
merged 3 commits into from Mar 9, 2017
Merged

Cleanup compilations & tests #5309

merged 3 commits into from Mar 9, 2017

Conversation

lxn2
Copy link
Member

@lxn2 lxn2 commented Mar 8, 2017

  • Changed amalgamation Makefile to be flexible with different flags so we can compile the following:
  1. make USE_BLAS=atlas
  2. make USE_BLAS=atlas MIN=1
  3. make USE_BLAS=atlas MSHADOW_USE_MKL=1
  4. make USE_BLAS=atlas MSHADOW_USE_CUDA=1
  5. make USE_BLAS=atlas DISABLE_OPENMP=0
  • Cleaned up Dockerfile and Jenkins script

@lxn2
Copy link
Member Author

lxn2 commented Mar 8, 2017

Test results:

[make USE_BLAS=atlas](http://jenkins-master-elb-1979848568.us-east-1.elb.amazonaws.com/job/mxnet-amalgamation/16/FLAG=1,label=testgpu/console)
[make USE_BLAS=atlas MIN=1](http://jenkins-master-elb-1979848568.us-east-1.elb.amazonaws.com/job/mxnet-amalgamation/16/FLAG=2,label=testgpu/console)
[make USE_BLAS=atlas MSHADOW_USE_MKL=1](http://jenkins-master-elb-1979848568.us-east-1.elb.amazonaws.com/job/mxnet-amalgamation/16/FLAG=3,label=testgpu/console)
[make USE_BLAS=atlas MSHADOW_USE_CUDA=1](http://jenkins-master-elb-1979848568.us-east-1.elb.amazonaws.com/job/mxnet-amalgamation/FLAG=4,label=testgpu/16/console)
[make USE_BLAS=atlas DISABLE_OPENMP=0](http://jenkins-master-elb-1979848568.us-east-1.elb.amazonaws.com/job/mxnet-amalgamation/FLAG=5,label=testgpu/16/console)

piiswrong
piiswrong reviewed Mar 8, 2017
View reviewed changes
amalgamation/Makefile Outdated
CFLAGS=-std=c++11 -Wno-unknown-pragmas -Wall $(DEFS)
ifneq ($(MIN), 1)
CFLAGS += -I${OPENBLAS_ROOT} -I${OPENBLAS_ROOT}/include
LDFLAGS+= -L${OPENBLAS_ROOT} -L${OPENBLAS_ROOT}/lib -lopenblas
LDFLAGS+= -L${OPENBLAS_ROOT} -L${OPENBLAS_ROOT}/lib
ifeq ($(USE_BLAS), openblas)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

document USE_BLAS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@piiswrong piiswrong merged commit 64f21f0 into apache:master Mar 9, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@piiswrong piiswrong piiswrong left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lxn2 @piiswrong