Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ziaee/ebrains-spack-builds
  • rshimoura/ebrains-spack-builds
  • hl11/ebrains-spack-builds
  • filippomarchetti/ebrains-spack-builds
  • jkaiser/ebrains-spack-builds
  • hjorth/ebrains-spack-builds-sept-2024
  • dsegebarth/ebrains-spack-builds
  • kozlov/ebrains-spack-builds
  • dsegebarth/ebrains-spack-builds-na-3
  • ansimsek/ebrains-spack-builds
  • lupoc/ebrains-spack-builds
  • hartmut/ebrains-spack-builds
  • ri/tech-hub/platform/esd/ebrains-spack-builds
  • lcalori0/ebrains-spack-builds
  • deepu/ebrains-spack-builds
  • noelp/ebrains-spack-builds
16 results
Show changes
Commits on Source (14)
......@@ -78,7 +78,7 @@ deploy-prod-release-prod-cscs:
OC_PROJECT: jupyterhub
resource_group: shared-NFS-mount-prod-cscs
rules:
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ /release/'
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ /ebrains/'
when: manual
allow_failure: false
......@@ -101,7 +101,7 @@ deploy-prod-release-prod-jsc:
OC_PROJECT: jupyterhub
resource_group: shared-NFS-mount-prod-jsc
rules:
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ /release/'
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH =~ /ebrains/'
when: manual
allow_failure: false
......
......@@ -53,12 +53,13 @@ python -m ipykernel_launcher -f \$@
EOF
chmod +x $LAB_KERNEL_PATH/bin/env.sh
# create the new kernel's configuration file
mkdir $LAB_KERNEL_PATH/spack_python_kernel_release_202112
cat <<EOF >$LAB_KERNEL_PATH/spack_python_kernel_release_202112/kernel.json
mkdir $LAB_KERNEL_PATH/spack_python_kernel_release_202207
cat <<EOF >$LAB_KERNEL_PATH/spack_python_kernel_release_202207/kernel.json
{
"argv": ["$LAB_KERNEL_PATH/bin/env.sh", "{connection_file}", "--profile=default"],
"display_name": "EBRAINS_release_v0.2_202112",
"name": "spack_python_kernel_release_202112",
"language": "python"
"display_name": "EBRAINS-22.07",
"name": "spack_python_kernel_release_202207",
"language": "python",
"env": { "LAB_KERNEL_NAME": "EBRAINS-22.07", "LAB_KERNEL_RELEASE_DATE": "$(date +"%Y-%m-%d")" }
}
EOF
......@@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
import os
class Hxtorch(WafPackage):
......@@ -12,7 +13,7 @@ class Hxtorch(WafPackage):
# This repo provides a waf binary used for the build below
git = "https://github.com/electronicvisions/pynn-brainscales.git"
version('2.0-rc6', branch='waf')
version('2.0-rc8', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@2.0:')
......@@ -60,33 +61,67 @@ class Hxtorch(WafPackage):
for dep in self.spec.traverse(deptype='build'):
query = self.spec[dep.name]
try:
if dep.name in ['pthreadpool', 'fxdiv']:
print('skipping {} in SPACK_INCLUDE_DIRS/CPATH/C{{,_PLUS}}_INCLUDE_PATH\n'.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:', query.headers.directories, "\n")
print('headers (', dep.name, '):', query.headers.directories, "\n")
except:
pass
library = []
for dep in self.spec.traverse(deptype=('link', 'run')):
query = self.spec[dep.name]
# we probably should skip/remove the entries for the same
# dependencies as above; however, ".libs" relies on the package
# name being the same as the library name (e.g. approx.
# libPACKAGE.so) so we are just moving googletest to the front
if dep.name == 'googletest':
for d in [self.spec['googletest'].prefix.lib64, self.spec['googletest'].prefix.lib]:
if os.path.exists(d):
print('moving to front of SPACK_{LINK,RPATH}_DIRS\n', d)
env.remove_path('SPACK_LINK_DIRS', d)
env.prepend_path('SPACK_LINK_DIRS', d)
env.remove_path('SPACK_RPATH_DIRS', d)
env.prepend_path('SPACK_RPATH_DIRS', d)
try:
library.extend(query.libs.directories)
print('libs:', query.libs.directories, "\n")
print('libs (', dep.name, '):', query.libs.directories, "\n")
# extend at front
library = query.libs.directories + library
except:
pass
path = []
for dep in self.spec.traverse(deptype=('build', 'link', 'run')):
if dep.name in ['pthreadpool', 'fxdiv']:
print('skipping {} for bin'.format(dep.name))
continue
query = self.spec[dep.name]
try:
path.append(query.prefix.bin)
print('bin:', query.prefix.bin, "\n")
print('bin (', dep.name, '):', query.prefix.bin, "\n")
except:
pass
# llvm might be built with ~shared_libs but still builds shared libs
if not any('llvm' in lib for lib in library):
print("libs: manually adding ", self.spec['llvm'].prefix.lib)
library.append(self.spec['llvm'].prefix.lib)
# explicitly add googletest library if it isn't found above;
# adding in front of the list of libraries is a hack to circumvent
# issues from vendoring packages like pthreadpool
if not any('googletest' in lib for lib in library):
if os.path.isdir(self.spec['googletest'].prefix.lib64):
print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib64)
library.insert(0, self.spec['googletest'].prefix.lib64)
if os.path.isdir(self.spec['googletest'].prefix.lib):
print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib)
library.insert(0, self.spec['googletest'].prefix.lib)
env.set('CPATH', ':'.join(include))
env.set('C_INCLUDE_PATH', ':'.join(include))
env.set('CPLUS_INCLUDE_PATH', ':'.join(include))
......@@ -127,7 +162,7 @@ class Hxtorch(WafPackage):
args = ['--prefix={0}'.format(self.prefix)]
args += self.configure_args()
self.waf('configure', *args)
self.waf('configure', '--build-profile=release', *args)
def build_args(self):
args = ['--keep', '--test-execnone', '-v']
......
......@@ -11,7 +11,7 @@ class PynnBrainscales(WafPackage):
homepage = "https://github.com/electronicvisions/pynn-brainscales"
git = "https://github.com/electronicvisions/pynn-brainscales.git"
version('2.0-rc6', branch='waf')
version('2.0-rc8', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@2.0:')
......@@ -84,6 +84,7 @@ class PynnBrainscales(WafPackage):
# llvm might be built with ~shared_libs but still builds shared libs
if not any('llvm' in lib for lib in library):
print("libs: manually adding ", self.spec['llvm'].prefix.lib)
library.append(self.spec['llvm'].prefix.lib)
env.set('CPATH', ':'.join(include))
......@@ -126,7 +127,7 @@ class PynnBrainscales(WafPackage):
args = ['--prefix={0}'.format(self.prefix)]
args += self.configure_args()
self.waf('configure', *args)
self.waf('configure', '--build-profile=release', *args)
def build_args(self):
args = ['--keep', '--test-execnone', '-v']
......
......@@ -29,8 +29,8 @@ spack:
- py-pyaescrypt
- py-formencode
- tvb-framework ^binutils+ld+gold
- pynn-brainscales@2.0-rc6 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
#- hxtorch@2.0-rc6 ^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-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
#- py-cerebstats
#- py-cerebunit
......