Permalink
Browse files

Merge pull request #1257 from boegel/mxnet_fixes

fix for MXNet easyblock
  • Loading branch information...
2 parents 806d1be + 49453c5 commit b8e662e37f7679d24afa150a3a6c306784e41764 @wpoely86 wpoely86 committed on GitHub Sep 25, 2017
Showing with 3 additions and 2 deletions.
  1. +3 −2 easybuild/easyblocks/m/mxnet.py
@@ -87,14 +87,14 @@ def extract_step(self):
# Extract everything into separate directories.
super(EB_MXNet, self).extract_step()
- mxnet_dirs = glob.glob(os.path.join(self.builddir, 'mxnet-*'))
+ mxnet_dirs = glob.glob(os.path.join(self.builddir, '*mxnet-*'))
if len(mxnet_dirs) == 1:
self.mxnet_src_dir = mxnet_dirs[0]
self.log.debug("MXNet dir is: %s", self.mxnet_src_dir)
else:
raise EasyBuildError("Failed to find/isolate MXNet source directory: %s", mxnet_dirs)
- for srcdir in [d for d in os.listdir(self.builddir) if not d.startswith('mxnet-')]:
+ for srcdir in [d for d in os.listdir(self.builddir) if d != os.path.basename(self.mxnet_src_dir)]:
submodule, _, _ = srcdir.rpartition('-')
newdir = os.path.join(self.mxnet_src_dir, submodule)
olddir = os.path.join(self.builddir, srcdir)
@@ -197,6 +197,7 @@ def sanity_check_step(self):
if not self.py_ext.sanity_check_step():
raise EasyBuildError("The sanity check for the Python bindings failed")
+ self.r_ext.options['modulename'] = self.name.lower()
if not self.r_ext.sanity_check_step():
raise EasyBuildError("The sanity check for the R bindings failed")

0 comments on commit b8e662e

Please sign in to comment.