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

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

Add hxtorch@2.0-rc8 to environment

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!127
parents f64d31a2 721fd7e3
No related branches found
No related tags found
3 merge requests!148create new experimental release,!139create new experimental release,!127Add hxtorch@2.0-rc8 to environment
Pipeline #17645 failed with stage
in 1 hour, 49 minutes, and 26 seconds
...@@ -59,28 +59,37 @@ class Hxtorch(WafPackage): ...@@ -59,28 +59,37 @@ class Hxtorch(WafPackage):
include = [] include = []
for dep in self.spec.traverse(deptype='build'): 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] query = self.spec[dep.name]
try: try:
include.extend(query.headers.directories) include.extend(query.headers.directories)
print('headers:', query.headers.directories, "\n") print('headers (', dep.name, '):', query.headers.directories, "\n")
except: except:
pass pass
library = [] library = []
for dep in self.spec.traverse(deptype=('link', 'run')): 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] query = self.spec[dep.name]
try: try:
library.extend(query.libs.directories) library.extend(query.libs.directories)
print('libs:', query.libs.directories, "\n") print('libs (', dep.name, '):', query.libs.directories, "\n")
except: except:
pass pass
path = [] path = []
for dep in self.spec.traverse(deptype=('build', 'link', 'run')): for dep in self.spec.traverse(deptype=('build', 'link', 'run')):
if dep.name == 'pthreadpool':
print('skipping {} for bin'.format(dep.name))
continue
query = self.spec[dep.name] query = self.spec[dep.name]
try: try:
path.append(query.prefix.bin) path.append(query.prefix.bin)
print('bin:', query.prefix.bin, "\n") print('bin (', dep.name, '):', query.prefix.bin, "\n")
except: except:
pass pass
......
...@@ -30,7 +30,7 @@ spack: ...@@ -30,7 +30,7 @@ spack:
- py-formencode - py-formencode
- tvb-framework ^binutils+ld+gold - tvb-framework ^binutils+ld+gold
- pynn-brainscales@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock - 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-neo
#- py-cerebstats #- py-cerebstats
#- py-cerebunit #- 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