summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Tang <jcftang@gmail.com>2017-06-23 15:18:50 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2017-06-23 09:18:50 -0500
commit7fb9c3903fc523fbae785475629114daf677b6a5 (patch)
tree91eaea43c4f2a58dae0c091a78c3c7827b4a71e6
parenta4de3177374e4afe5f025c0526a0a198e7a76645 (diff)
downloadspack-7fb9c3903fc523fbae785475629114daf677b6a5.tar.gz
spack-7fb9c3903fc523fbae785475629114daf677b6a5.tar.bz2
spack-7fb9c3903fc523fbae785475629114daf677b6a5.tar.xz
spack-7fb9c3903fc523fbae785475629114daf677b6a5.zip
Minor fixes to CNTK package (#4429)
* Remove unneeded patch lines which fail for the most recent CNTK version on the head of the git repo * Really check for NVML/GDK * Fix some violations
-rw-r--r--var/spack/repos/builtin/packages/cntk/build.patch15
-rw-r--r--var/spack/repos/builtin/packages/cntk/package.py8
2 files changed, 6 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/cntk/build.patch b/var/spack/repos/builtin/packages/cntk/build.patch
index 0b1e46e911..7ae6101db3 100644
--- a/var/spack/repos/builtin/packages/cntk/build.patch
+++ b/var/spack/repos/builtin/packages/cntk/build.patch
@@ -244,21 +244,6 @@ index 2c2e5cee7..c9c0072c9 100755
function find_gdk_include ()
{
find_dir "$default_gdk_includes" "$gdk_include_check"
-@@ -352,11 +382,14 @@ function show_help ()
- echo " --with-openblas[=directory] (experimental) $(show_default $(find_openblas))"
- echo " --with-buildtype=(debug|release) $(show_default $default_buildtype)"
- echo " --with-kaldi[=directory] $(show_default $(find_kaldi))"
-+ echo " --with-openfst[=directory] $(show_default $(find_openfst))"
- echo " --with-opencv[=directory] $(show_default $(find_opencv))"
- echo " --with-libzip[=directory] $(show_default $(find_libzip))"
- echo " --with-code-coverage[=(yes|no)] $(show_default ${default_use_code_coverage})"
- echo " --with-boost[=directory] $(show_default $(find_boost))"
- echo " --with-protobuf[=directory] $(show_default $(find_protobuf))"
-+ echo " --with-multiverso[=directory] $(show_default $(find_multiverso))"
-+ echo " --with-1bitsgd[=directory] $(show_default $(find_onebitsgd))"
- echo " --with-py-versions=(space-separated list of 27, 34, 35)"
- echo " --with-py27-path[=directory] $(show_default $(find_python 27))"
- echo " --with-py34-path[=directory] $(show_default $(find_python 34))"
@@ -751,6 +784,46 @@ do
fi
fi
diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py
index 801c69dae4..025498fa8a 100644
--- a/var/spack/repos/builtin/packages/cntk/package.py
+++ b/var/spack/repos/builtin/packages/cntk/package.py
@@ -31,10 +31,10 @@ class Cntk(Package):
via a directed graph."""
homepage = "https://www.microsoft.com/en-us/research/product/cognitive-toolkit"
- url = "https://github.com/Microsoft/CNTK/archive/v2.0.beta15.0.tar.gz"
+ url = "https://github.com/Microsoft/CNTK/archive/v2.0.tar.gz"
version('master', git='https://github.com/Microsoft/CNTK.git', branch='master')
- version('2.0.rc1', url='https://github.com/Microsoft/CNTK/archive/v2.0.rc1.tar.gz')
+ version('2.0', '8038780f1169ceea578e5ef4d69e4c6f')
variant('opencv', default=False, description="Enable OpenCV support.")
variant('kaldi', default=False, description="Enable Kaldi support.")
@@ -106,6 +106,10 @@ class Cntk(Package):
args.append('--with-cudnn={0}'
.format(spec['cudnn'].prefix))
args.append('--with-nccl={0}'.format(spec['nccl'].prefix))
+ args.append('--with-gdk-include={0}'
+ .format(spec['cuda'].prefix.include))
+ args.append('--with-gdk-nvml-lib={0}/stubs'
+ .format(spec['cuda'].prefix.lib64))
configure(*args)