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.

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

strip Suppressor out of ResistanceGA #20106

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ exts_list = [
}),
]

sanity_check_commands = ["julia -e 'using Pkg;Pkg.test(\"Circuitscape\")'"]
sanity_check_commands = [
"""julia -e 'using Pkg; Pkg.activate("%(installdir)s/environments/v1.9"); Pkg.test("%(name)s")'""",
]

moduleclass = 'lib'
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ dependencies = [
('Julia', local_juliaver, '-linux-%s' % ARCH, SYSTEM),
]

preinstallopts = "export LD_LIBRARY_PATH=$EBROOTJULIA/lib/julia:$LD_LIBRARY_PATH && "

exts_default_options = {
'source_tmpl': 'v%(version)s.tar.gz',
}
Expand Down Expand Up @@ -224,17 +222,13 @@ exts_list = [
}),
]

sanity_check_commands = ["julia -e 'using Pkg;Pkg.test(\"%(name)s\")'"]
sanity_check_commands = [
"""julia -e 'using Pkg; Pkg.activate("%(installdir)s/environments/v1.9"); Pkg.test("%(name)s")'""",
]

sanity_check_paths = {
'files': [],
'dirs': ['packages/%(name)s'],
}

# When loading R and Julia, there seems to be a library collision and Julia (namely Pkg module) doesn't work properly
# This is a workaround to make Julia find the correct libraries
modluafooter = """
prepend_path("LD_LIBRARY_PATH", os.getenv("EBROOTJULIA") .. "/lib/julia")
"""

moduleclass = 'tools'
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ toolchain = {'name': 'foss', 'version': '2022a'}
dependencies = [
('R', '4.2.1'),
('Julia', local_juliaver, '-linux-%s' % ARCH, SYSTEM),
('RCall', '0.13.17', versionsuffix), # order matters! RCall must be loaded before Circuitscape (#19281)
('Circuitscape', '5.12.3', '-Julia-%s' % local_juliaver, SYSTEM),
('RCall', '0.13.17', versionsuffix),
('Suppressor', '0.2.4', '-Julia-%s' % local_juliaver, SYSTEM),
]

exts_defaultclass = 'RPackage'
Expand All @@ -31,14 +32,6 @@ exts_default_options = {
}

exts_list = [
('Suppressor', '0.2.4', {
'easyblock': 'JuliaPackage',
'exts_filter': ("julia -e 'using %(ext_name)s'", ''),
'preinstallopts': "export LD_LIBRARY_PATH=$EBROOTJULIA/lib/julia:$LD_LIBRARY_PATH && ",
'source_tmpl': 'v%(version)s.tar.gz',
'source_urls': ['https://github.com/JuliaIO/Suppressor.jl/archive/'],
'checksums': ['5075b06ed6aa0956c786e5b5fe3d77571a4dd34e6d63b45e113c312729384cf4'],
}),
('GA', '3.2.2', {
'checksums': ['6245c634a11b8414bde7ed326b8c615512645489b19969619484c865e900bf8c'],
}),
Expand Down Expand Up @@ -73,12 +66,6 @@ modextrapaths = {
'R_LIBS_SITE': '',
}

# When loading R and Julia, there seems to be a library collision and Julia (namely Pkg module) doesn't work properly
# This is a workaround to make Julia find the correct libraries
modluafooter = """
prepend_path("LD_LIBRARY_PATH", os.getenv("EBROOTJULIA") .. "/lib/julia")
"""

sanity_check_paths = {
'files': [],
'dirs': ['%(name)s'],
Expand Down
22 changes: 22 additions & 0 deletions easybuild/easyconfigs/s/Suppressor/Suppressor-0.2.4-Julia-1.9.2.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
easyblock = 'JuliaPackage'

name = 'Suppressor'
version = '0.2.4'
_julia_ver = '1.9.2'
versionsuffix = "-Julia-%s" % _julia_ver

homepage = 'https://github.com/JuliaIO/Suppressor.jl'
description = """Julia macros for suppressing and/or capturing output (STDOUT),
warnings (STDERR) or both streams at the same time."""

toolchain = SYSTEM

source_urls = ['https://github.com/JuliaIO/Suppressor.jl/archive/']
sources = ['v%(version)s.tar.gz']
checksums = ['5075b06ed6aa0956c786e5b5fe3d77571a4dd34e6d63b45e113c312729384cf4']

dependencies = [
('Julia', _julia_ver, '-linux-%s' % ARCH, SYSTEM),
]

moduleclass = 'lib'
6 changes: 3 additions & 3 deletions test/easyconfigs/easyconfigs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1210,12 +1210,12 @@ def test_pr_sanity_check_paths(self):
"""Make sure a custom sanity_check_paths value is specified for easyconfigs that use a generic easyblock."""

# some generic easyblocks already have a decent customised sanity_check_paths,
# including CargoPythonPackage, CMakePythonPackage, GoPackage, JuliaBundle, PerlBundle,
# including CargoPythonPackage, CMakePythonPackage, GoPackage, JuliaBundle & JuliaPackage, PerlBundle,
# PythonBundle & PythonPackage;
# BuildEnv, ModuleRC and Toolchain easyblocks doesn't install anything so there is nothing to check.
whitelist = ['BuildEnv', 'CargoPythonBundle', 'CargoPythonPackage', 'CMakePythonPackage',
'ConfigureMakePythonPackage', 'CrayToolchain', 'GoPackage', 'JuliaBundle', 'ModuleRC',
'PerlBundle', 'PythonBundle', 'PythonPackage', 'Toolchain']
'ConfigureMakePythonPackage', 'CrayToolchain', 'GoPackage', 'JuliaBundle', 'JuliaPackage',
'ModuleRC', 'PerlBundle', 'PythonBundle', 'PythonPackage', 'Toolchain']
# Bundles of dependencies without files of their own
# Autotools: Autoconf + Automake + libtool, (recent) GCC: GCCcore + binutils, CUDA: GCC + CUDAcore,
# CESM-deps: Python + Perl + netCDF + ESMF + git, FEniCS: DOLFIN and co,
Expand Down
Loading