Skip to content
Snippets Groups Projects
Commit 3842c05e authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'fix_and_add_hxtorch_2.0-rc8_again4' into 'master'

Fixup 8afb42 (Fix hxtorch)

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!128
parents 971a3540 21035bfb
No related branches found
No related tags found
3 merge requests!148create new experimental release,!139create new experimental release,!128Fixup 8afb42 (Fix hxtorch)
Pipeline #17657 failed with stage
in 4 hours, 57 minutes, and 3 seconds
......@@ -59,11 +59,14 @@ class Hxtorch(WafPackage):
include = []
for dep in self.spec.traverse(deptype='build'):
if dep.name == 'pthreadpool':
print('skipping {} for headers'.format(dep.name))
continue
query = self.spec[dep.name]
try:
if dep.name == 'pthreadpool':
print('skipping {} for headers'.format(dep.name))
for d in query.headers.directories:
if os.path.exists(d):
env.remove_path('SPACK_INCLUDE_DIRS', d)
continue
include.extend(query.headers.directories)
print('headers (', dep.name, '):', query.headers.directories, "\n")
except:
......@@ -71,11 +74,15 @@ class Hxtorch(WafPackage):
library = []
for dep in self.spec.traverse(deptype=('link', 'run')):
if dep.name == 'pthreadpool':
print('skipping {} for libs'.format(dep.name))
continue
query = self.spec[dep.name]
try:
if dep.name == 'pthreadpool':
print('skipping {} for libs'.format(dep.name))
for d in query.libs.directories:
if os.path.exists(d):
env.remove_path('SPACK_LINK_DIRS', d)
env.remove_path('SPACK_RPATH_DIRS', d)
continue
library.extend(query.libs.directories)
print('libs (', dep.name, '):', query.libs.directories, "\n")
except:
......
......@@ -30,7 +30,7 @@ spack:
- py-formencode
- tvb-framework ^binutils+ld+gold
- pynn-brainscales@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
#- hxtorch@2.0-rc6 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- hxtorch@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
#- py-cerebstats
#- py-cerebunit
......
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