Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update CBLAS easyblock to build with foss toolchain #1024

Merged
merged 2 commits into from Oct 27, 2016
Merged

update CBLAS easyblock to build with foss toolchain #1024

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4560a39
update CBLAS easyblock to build with foss toolchain
boegel Oct 27, 2016
2b45340
also check for .so in sanity check
boegel Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 17 additions & 21 deletions easybuild/easyblocks/c/cblas.py
View file
Open in desktop
@@ -1,5 +1,5 @@
##
# Copyright 2013 Ghent University
# Copyright 2013-2016 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -30,10 +30,10 @@

import glob
import os
import shutil

from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import copy_file


class EB_CBLAS(ConfigureMake):
Expand All @@ -46,10 +46,7 @@ def configure_step(self):
"""
Configure CBLAS build by copying Makefile.LINUX to Makefile.in, and setting make options
"""
try:
shutil.copy2('Makefile.LINUX', 'Makefile.in')
except OSError, err:
raise EasyBuildError("Failed to copy makefile: %s", err)
copy_file('Makefile.LINUX', 'Makefile.in')

if not self.cfg['buildopts']:
self.cfg.update('buildopts', 'all')
Expand All @@ -59,8 +56,12 @@ def configure_step(self):
self.cfg.update('buildopts', 'CFLAGS="%s -DADD_"' % os.getenv('CFLAGS'))
self.cfg.update('buildopts', 'FFLAGS="%s -DADD_"' % os.getenv('FFLAGS'))
blas_lib_dir = os.getenv('BLAS_LIB_DIR')
blas_libs = [os.path.join(blas_lib_dir, lib) for lib in os.getenv('BLAS_STATIC_LIBS').split(',')]
self.cfg.update('buildopts', 'BLLIB="%s"' % ' '.join(blas_libs))
blas_libs = []
for blas_lib in os.getenv('BLAS_STATIC_LIBS').split(','):
blas_lib = os.path.join(blas_lib_dir, blas_lib)
if os.path.exists(blas_lib):
blas_libs.append(blas_lib)
self.cfg.update('buildopts', 'BLLIB="%s %s"' % (' '.join(blas_libs), os.getenv('LIBS', '')))

# default build procedure should do

Expand All @@ -70,24 +71,19 @@ def install_step(self):
"""
srcdir = os.path.join(self.cfg['start_dir'], 'lib')
targetdir = os.path.join(self.installdir, 'lib')
try:
os.makedirs(targetdir)

shutil.copy2(os.path.join(srcdir, 'cblas_LINUX.a'), os.path.join(targetdir, 'libcblas.a'))
srclib = os.path.join(srcdir, 'libcblas.so')
if os.path.exists(srclib):
for solib in glob.glob(os.path.join(srcdir, 'libcblas.so*')):
shutil.copy2(solib, targetdir)
except OSError, err:
raise EasyBuildError("Failed to install CBLAS (srcdir: %s, targetdir: %s): %s", srcdir, targetdir, err)
copy_file(os.path.join(srcdir, 'cblas_LINUX.a'), os.path.join(targetdir, 'libcblas.a'))
srclib = os.path.join(srcdir, 'libcblas.so')
if os.path.exists(srclib):
for solib in glob.glob(os.path.join(srcdir, 'libcblas.so*')):
copy_file(solib, os.path.join(targetdir, os.path.basename(solib)))

def sanity_check_step(self):
"""
Custom sanity check for CBLAS.
"""
custom_paths = {
'files': ["lib/libcblas.a"],
'dirs': [],
}

'files': ["lib/libcblas.a"],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so?

'dirs': [],
}
super(EB_CBLAS, self).sanity_check_step(custom_paths=custom_paths)