Skip to content
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
37 changes: 0 additions & 37 deletions ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -338,43 +338,6 @@ local common_json = import "../common.json";
}
},

fastr:: {
# Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
# of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)
# However, we do not need to load those modules, we only configure specific environment variables to
# point to these specific modules. These modules and the configuration is only necessary for installation of
# some R packages (that have Fortran code) and in order to run GNU-R
packages+:
if (self.os == "linux" && self.arch == "amd64") then {
readline: '==6.3',
pcre2: '==10.37',
gnur: '==4.0.3-gcc4.8.5-pcre2',
} + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
else {},
environment+:
if (self.os == "linux" && self.arch == "amd64") then {
TZDIR: '/usr/share/zoneinfo',
PKG_INCLUDE_FLAGS_OVERRIDE : '-I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre2/10.37/include -I/cm/shared/apps/curl/7.50.1/include',
PKG_LDFLAGS_OVERRIDE : '-L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64',
FASTR_FC: '/cm/shared/apps/gcc/4.8.5/bin/gfortran',
FASTR_CC: '/cm/shared/apps/gcc/4.8.5/bin/gcc',
GNUR_HOME_BINARY: '/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3',
FASTR_RELEASE: 'true',
}
else {},
downloads+:
if (self.os == "linux" && self.arch == "amd64") then {
BLAS_LAPACK_DIR: { name: 'fastr-403-blas-lapack-gcc', version: '4.8.5', platformspecific: true },
F2C_BINARY: { name: 'f2c-binary', version: '7', platformspecific: true },
FASTR_RECOMMENDED_BINARY: { name: 'fastr-recommended-pkgs', version: '16', platformspecific: true },
}
else {},
catch_files+: if (self.os != "windows" && self.arch == "amd64") then [
'GNUR_CONFIG_LOG = (?P<filename>.+\\.log)',
'GNUR_MAKE_LOG = (?P<filename>.+\\.log)',
] else [],
},

svm:: {
packages+: {
cmake: "==3.22.2",
Expand Down
1 change: 0 additions & 1 deletion vm/ci/ci_common/common-runspec.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
local sulong = task_spec(graal_common.deps.sulong),
local graalpy = task_spec(graal_common.deps.graalpy),
local graalnodejs = task_spec(graal_common.deps.graalnodejs),
local fastr = task_spec(graal_common.deps.fastr),

local timelimit(t) = evaluate_late('999_time_limit', { // the key starts with 999 to be the last one evaluated
timelimit: t
Expand Down
8 changes: 1 addition & 7 deletions vm/ci/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ local devkits = graal_common.devkits;
},
},

fastr_no_recommended: {
environment+: {
FASTR_NO_RECOMMENDED: 'true'
},
},

vm_linux_amd64: graal_common.linux_amd64 + self.common_vm_linux + graal_common.deps.svm,

vm_linux_amd64_ol9: graal_common.linux_amd64_ol9 + self.common_vm_linux + graal_common.deps.svm,
Expand Down Expand Up @@ -145,7 +139,7 @@ local devkits = graal_common.devkits;
$.mx_vm_complete + self.artifact_deploy_standalones_dry_run(os)
],

full_vm_build: graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + graal_common.deps.fastr + vm.custom_vm + graal_common.deps.espresso,
full_vm_build: graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + graal_common.deps.espresso,

graalvm_complete_build_deps(edition, os, arch, java_version, espresso_java_version=25, espresso_extra_java_version=[21]):
local java_deps(edition) =
Expand Down
2 changes: 1 addition & 1 deletion vm/mx.vm/ce-aarch64-complete
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Same as the ce-aarch64 env, except more dynamic imports and no NATIVE_IMAGES list, and no fastr
# Same as the ce-aarch64 env, except more dynamic imports and no NATIVE_IMAGES list
DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython
COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmjdwp,svmt,svmsl,tflc,tflsm
NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
2 changes: 1 addition & 1 deletion vm/mx.vm/ce-complete
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Same as the ce env, except more dynamic imports and no NATIVE_IMAGES list
DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython
DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython
COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmjdwp,svmt,svmsl,tflc,tflsm
NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
2 changes: 1 addition & 1 deletion vm/mx.vm/ce-darwin-aarch64-complete
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Same as the ce-darwin-aarch64 env, except more dynamic imports and no NATIVE_IMAGES list, and no fastr
# Same as the ce-darwin-aarch64 env, except more dynamic imports and no NATIVE_IMAGES list
DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython
COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmjdwp,svmt,svmsl,tflc,tflsm
NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
4 changes: 0 additions & 4 deletions vm/mx.vm/ce-fastr

This file was deleted.

4 changes: 0 additions & 4 deletions vm/mx.vm/ce-fastr-native

This file was deleted.

2 changes: 1 addition & 1 deletion vm/mx.vm/ce-win-complete
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Same as the ce-win env, except more dynamic imports and no NATIVE_IMAGES list, and no truffleruby,fastr
# Same as the ce-win env, except more dynamic imports and no NATIVE_IMAGES list
DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython
COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmjdwp,svmt,svmsl,tflc,tflsm
NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
14 changes: 0 additions & 14 deletions vm/mx.vm/mx_vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def local_path_to_url(args):
ce_components = ce_components_minimal + ['nr_lib_jvmcicompiler', 'bnative-image-utils', 'ni', 'nic', 'nil', 'svm', 'svmt', 'svmnfi', 'svmsl']
ce_python_components = ['antlr4', 'sllvmvm', 'cmp', 'cov', 'dap', 'dis', 'gvm', 'icu4j', 'xz', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrl', 'llrlf', 'llrn', 'lsp', 'nfi-libffi', 'nfi', 'pro', 'pyn', 'pynl', 'rgx', 'sdk',
'sdkni', 'sdkc', 'sdkl', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json']
ce_fastr_components = ce_components + llvm_components + ['antlr4', 'xz', 'sllvmvm', 'llp', 'bnative-image', 'snative-image-agent', 'R', 'sRvm', 'bnative-image-utils', 'llrc', 'snative-image-diagnostics-agent', 'llrn', 'llrl', 'llrlf']
ce_no_native_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lsp', 'nfi-libffi', 'nfi', 'pro', 'sdk', 'sdkni', 'sdkc', 'sdkl', 'tfl', 'tfla', 'tflc', 'tflm', 'tflllm', 'truffle-json']

# Main GraalVMs
Expand All @@ -101,7 +100,6 @@ def local_path_to_url(args):
mx_sdk_vm.register_vm_config('ce', ce_components + ['icu4j', 'xz', 'js', 'jsl', 'jss', 'rgx', 'bnative-image', 'snative-image-agent', 'snative-image-diagnostics-agent', 'tflsm'], _suite, dist_name='ce-js', env_file='ce-js')
mx_sdk_vm.register_vm_config('ce', ce_components + ['gwal', 'gwa', 'icu4j', 'xz', 'js', 'jsl', 'jss', 'njs', 'njsl', 'rgx', 'sjsvm', 'swasmvm', 'tflsm'], _suite, dist_name='ce', env_file='ce-nodejs')
mx_sdk_vm.register_vm_config('ce', ce_components_minimal + ['antlr4', 'llrn', 'llp', 'llrc', 'llrl', 'llrlf'], _suite, env_file='ce-llvm')
mx_sdk_vm.register_vm_config('ce-fastr', ce_fastr_components, _suite)
mx_sdk_vm.register_vm_config('ce-no_native', ce_no_native_components, _suite)
mx_sdk_vm.register_vm_config('libgraal', ['cmp', 'lg', 'sdkc', 'tflc'], _suite)
mx_sdk_vm.register_vm_config('libgraal-bash', llvm_components + ['cmp', 'gvm', 'lg', 'nfi-libffi', 'nfi', 'sdk', 'sdkni', 'sdkc', 'sdkl', 'tfl', 'tfla', 'tflc', 'tflm'], _suite, env_file=False)
Expand Down Expand Up @@ -362,18 +360,6 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
:type register_project: (mx.Project) -> None
:type register_distribution: (mx.Distribution) -> None
"""
if mx_sdk_vm_impl.has_component('FastR'):
fastr_release_env = mx.get_env('FASTR_RELEASE', None)
if fastr_release_env != 'true':
mx.abort(
f"When including FastR, please set FASTR_RELEASE to 'true' (env FASTR_RELEASE=true mx ...). "
f"Got FASTR_RELEASE={fastr_release_env}. "
'For local development, you may also want to disable recommended packages build '
'(FASTR_NO_RECOMMENDED=true) and capturing of system libraries '
'(export FASTR_CAPTURE_DEPENDENCIES set to an empty value). '
'See building.md in FastR documentation for more details.'
)

if register_distribution and _suite.primary:
# Only primary suite can register languages and tools distributions.
# If the suite is not a primary suite, languages and tools distributions might not have been loaded yet.
Expand Down
1 change: 0 additions & 1 deletion vm/mx.vm/mx_vm_gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class VmGateTasks:
graal_js_tests_compiled = 'graal-js-tests-compiled'
graal_nodejs = 'graal-nodejs'
python = 'python'
fastr = 'fastr'
integration = 'integration'
tools = 'tools'
libgraal = 'libgraal'
Expand Down
8 changes: 0 additions & 8 deletions vm/mx.vm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@
{"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
]
},
{
"name": "fastr",
"version": "6e5e07a23c5dce133a07701d6c49afcfd9cee86c",
"dynamic": True,
"urls": [
{"url": "https://github.com/oracle/fastr.git", "kind": "git"},
]
},
{
"name": "graalpython",
"version": "196ff1a0e59d668babb49435e6fdfc5b2d388817",
Expand Down