Commit d1c3c8df authored by Lukáš Krupčík's avatar Lukáš Krupčík
Browse files

modified: b/Boost/Boost-1.63.0-foss-2017a-Python-3.6.1.eb

	new file:   c/CNTK/CNTK-2.0-foss-2017a-Python-3.6.1.eb
	new file:   c/CNTK/abs.patch
	new file:   c/CNTK/glibc.patch
	new file:   s/SWIG/SWIG-2.0.12-Python-3.6.1.eb
	new file:   s/Spack/Spack-0.10.0.eb
	deleted:    c/CNTK/CNTK-2.0-GCC-7.1.0-2.28-Python-3.6.1.eb
parent 4dd89bbf
...@@ -16,8 +16,8 @@ patches = [ ...@@ -16,8 +16,8 @@ patches = [
] ]
dependencies = [ dependencies = [
('bzip2', '1.0.6'), ('bzip2', '1.0.6', '', True),
('zlib', '1.2.11'), ('zlib', '1.2.11', '', True),
('Python', '3.6.1', '', True), ('Python', '3.6.1', '', True),
] ]
......
...@@ -9,24 +9,40 @@ description = """The Microsoft Cognitive Toolkit is a unified deep-learning tool ...@@ -9,24 +9,40 @@ description = """The Microsoft Cognitive Toolkit is a unified deep-learning tool
toolchain = {'name': 'foss', 'version': '2017a'} toolchain = {'name': 'foss', 'version': '2017a'}
source_urls = ['https://cntk.ai/PythonWheel/CPU-Only'] patches = [
sources = ['cntk-%(version)s-cp36-cp36m-linux_x86_64.whl'] 'glibc.patch',
'abs.patch',
]
use_pip = True source_urls = ['https://github.com/Microsoft/CNTK/archive']
unpack_sources = False sources = ['v%(version)s.tar.gz']
dependencies = [ dependencies = [
('Python', '3.6.1', '', True), ('Python', '3.6.1', '', True),
('libzip, '1.2.0', '', True), ('libzip', '1.2.0', '', True),
('zlib, '1.2.11', '', True), ('zlib', '1.2.11', '', True),
('protobuf, '3.2.0', '-Python-3.6.1', True), ('protobuf', '3.2.0', versionsuffix, True),
('CNTKCustomMKL','3.0', '', True), ('CNTKCustomMKL','3.0', '', True),
('OpenMPI', '1.10.7'), ('Boost', '1.63.0', versionsuffix, ('foss', '2017a')),
('SWIG', '3.0.12', versionsuffix, True),
# ('OpenMPI', '1.8.6', '', ('GCC', '4.4.7-system')),
] ]
prefix_opt = '--with-build-top='
preconfigopts = 'sed -i "s/cntk_custom_mkl_version=3/cntk_custom_mkl_version=3.0/" configure && '
preconfigopts += 'sed -i "s/-Werror//" Makefile && '
#preconfigopts += 'sed -i "s/#include <limits>/#include <limits>\\n#include <stdlib.h>/" Source/Math/BlockMultiplierPlatform.h &&'
prebuildopts = 'cd %(installdir)s &&'
configopts = '--with-py-versions=36 --with-buildtype=release --mpi=yes --python=yes --asgd=no '
configopts += '--with-boost=$EBROOTBOOST --with-protobuf=$EBROOTPROTOBUF --with-swig=$EBROOTSWIG --with-libzip=$EBROOTLIBZIP '
configopts += '--with-mpi=$EBROOTOPENMPI --with-py36-path=$EBROOTPYTHON --with-mkl=/apps/all/CNTKCustomMKL/ '
sanity_check_paths = { sanity_check_paths = {
'files': [], 'files': [],
'dirs': ['lib/python%(pyshortver)s/site-packages'], 'dirs': ['lib'],
} }
moduleclass = 'math' moduleclass = 'math'
--- Tests/UnitTests/V2LibraryTests/FunctionTests.cpp.old 2017-07-07 13:03:11.977578491 +0200
+++ Tests/UnitTests/V2LibraryTests/FunctionTests.cpp 2017-07-07 13:03:26.434040010 +0200
@@ -1040,7 +1040,7 @@
for (auto dropoutRate : { 0.9, 0.4, 0.0, 0.1 })
{
dropout->SetAttribute(L"dropoutRate", dropoutRate);
- BOOST_TEST(abs(zeroCount(forwardFunc(dropout)) - dropoutRate*shape.TotalSize()) < 100);
+ BOOST_TEST(fabs(zeroCount(forwardFunc(dropout)) - dropoutRate*shape.TotalSize()) < 100);
}
auto plusParam = CNTK::Parameter(CNTK::NDArrayView::RandomUniform<float>(shape, -0.5, 0.5, 1, device));
@@ -1051,7 +1051,7 @@
for (auto dropoutRate : { 0.3, 0.7, 0.2 })
{
dropout2->SetAttribute(L"dropoutRate", dropoutRate);
- BOOST_TEST(abs(zeroCount(forwardFunc(combine)) - dropoutRate*shape.TotalSize()) < 100);
+ BOOST_TEST(fabs(zeroCount(forwardFunc(combine)) - dropoutRate*shape.TotalSize()) < 100);
}
}
--- Source/Math/BlockMultiplierPlatform.h.old 2017-07-07 12:36:28.290807773 +0200
+++ Source/Math/BlockMultiplierPlatform.h 2017-07-07 12:37:05.878425807 +0200
@@ -10,9 +10,9 @@
#else
#ifdef __GNUC__
#include <stdlib.h>
-#define ALIGNED_ALLOC(bytes,alignment) aligned_alloc(alignment,bytes)
+#include <malloc.h>
+#define ALIGNED_ALLOC(bytes,alignment) memalign(alignment,bytes)
#define ALIGNED_FREE(ptr) free(ptr)
-//#define FORCEINLINE __attribute__((always_inline))
#define FORCEINLINE inline
#endif
#endif
name = 'SWIG'
version = '3.0.12'
versionsuffix = '-Python-%(pyver)s'
homepage = 'http://www.swig.org/'
description = """SWIG is a software development tool that connects programs written in C and C++ with
a variety of high-level programming languages."""
toolchain = {'name': 'dummy', 'version': ''}
toolchainopts = {'pic': True}
source_urls = [SOURCEFORGE_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
dependencies = [
('Python', '3.6.1'),
('PCRE', '8.40'),
]
moduleclass = 'devel'
easyblock = 'Tarball'
name = 'Spack'
version = '0.10.0'
homepage = 'https://spack.io/'
description = """Spack is a package manager for supercomputers, Linux, and macOS. It makes installing scientific
software easy. With Spack, you can build a package with multiple versions, configurations, platforms, and compilers,
and all of these builds can coexist on the same machine."""
toolchain = {'name': 'dummy', 'version': ''}
source_urls = ['https://github.com/LLNL/spack/archive/']
sources = ['v%(version)s.tar.gz']
sanity_check_paths = {
'files': ['bin/spack'],
'dirs': ['etc/spack/defaults', 'lib/spack', 'share/spack', 'var/spack'],
}
sanity_check_commands = [
"spack list",
"spack versions gcc",
]
moduleclass = 'devel'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment