Cleanup compilations & tests (apache#5309)

* Glob java paths

* Fix blas linking

* Document USE_BLAS

amalgamation/Makefile

@@ -24,15 +24,27 @@ ifndef EMCC
     EMCC=emcc
 endif
 
+ifndef DISABLE_OPENMP
+       DEFS+=-DDISABLE_OPENMP=1
+endif
 
 .PHONY: all clean
 
 DEFS+=-DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_MKL=0 -DMSHADOW_RABIT_PS=0 -DMSHADOW_DIST_PS=0 -DDMLC_LOG_STACK_TRACE=0
-DEFS+=-DMSHADOW_FORCE_STREAM -DMXNET_USE_OPENCV=0 -DMXNET_PREDICT_ONLY=1 -DDISABLE_OPENMP=1
+DEFS+=-DMSHADOW_FORCE_STREAM -DMXNET_USE_OPENCV=0 -DMXNET_PREDICT_ONLY=1
 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
+
+	# Define which blas is installed. Uses OpenBLAS by default.
+	ifeq ($(USE_BLAS), atlas)
+                LDFLAGS += -lcblas
+        else ifeq ($(USE_BLAS), blas)
+                LDFLAGS += -lblas
+        else
+		LDFLAGS += -lopenblas
+	endif
 endif
 
 

tests/ci_build/Dockerfile.ubuntu1404_cuda75_cudnn5

@@ -30,5 +30,5 @@ RUN apt-get install -y software-properties-common r-base-core libcurl4-openssl-d
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
 RUN add-apt-repository -y ppa:marutter/rdev
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y r-base r-base-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install r-base r-base-dev
 RUN Rscript -e "install.packages('devtools', repo = 'https://cran.rstudio.com')"

tests/jenkins/run_test_amzn_linux_gpu.sh

@@ -9,9 +9,10 @@ echo "ADD_CFLAGS += -I/usr/include/openblas" >>config.mk
 echo "GTEST_PATH=/usr/local/gtest" >> config.mk
 echo 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' >> ~/.profile
 echo 'export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH' >> ~/.profile
-echo 'export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-1.b15.25.amzn1.x86_64' >> ~/.profile
-echo 'export JRE_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-1.b15.25.amzn1.x86_64/jre' >> ~/.profile
-echo 'export PATH=$PATH:/apache-maven-3.3.9/bin/:/usr/bin:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-1.b15.25.amzn1.x86_64/bin:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-1.b15.25.amzn1.x86_64/jre/bin' >> ~/.profile
+JAVA_HOME=`/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.*.amzn1.x86_64[-1]`
+echo 'export JAVA_HOME=${JAVA_HOME}' >> ~/.profile
+echo 'export JRE_HOME=${JAVA_HOME}/jre' >> ~/.profile
+echo 'export PATH=$PATH:/apache-maven-3.3.9/bin/:/usr/bin:${JAVA_HOME}/bin' >> ~/.profile
 source ~/.profile
 user=`id -u -n`
 make -j 4 || exit -1