hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fixes to CNTK package (#4429)

Browse source 
* 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
This commit is contained in:
Jimmy Tang 2017-06-23 15:18:50 +01:00 committed by Adam J. Stewart
parent a4de317737
commit 7fb9c3903f
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/cntk/build.patch
View file

@ -244,21 +244,6 @@ index 2c2e5cee7..c9c0072c9 100755
function find_gdk_include () function find_gdk_include ()
{ {
find_dir "$default_gdk_includes" "$gdk_include_check" 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 @@ -751,6 +784,46 @@ do
fi fi
fi fi

8
var/spack/repos/builtin/packages/cntk/package.py
View file

@ -31,10 +31,10 @@ class Cntk(Package):
via a directed graph.""" via a directed graph."""
homepage = "https://www.microsoft.com/en-us/research/product/cognitive-toolkit" 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('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('opencv', default=False, description="Enable OpenCV support.")
variant('kaldi', default=False, description="Enable Kaldi support.") variant('kaldi', default=False, description="Enable Kaldi support.")
@ -106,6 +106,10 @@ def install(self, spec, prefix):
args.append('--with-cudnn={0}' args.append('--with-cudnn={0}'
.format(spec['cudnn'].prefix)) .format(spec['cudnn'].prefix))
args.append('--with-nccl={0}'.format(spec['nccl'].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) configure(*args)