Skip to content

Commit 1c9713a

Browse files
msimacekmsimacek
committed
[GR-21590] Update imports
PullRequest: graalpython/4147
2 parents bf20d29 + 33a54e4 commit 1c9713a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+365
-512
lines changed

‎ci/graal/ci/ci_common/bench-common.libsonnet‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# max number of threads to use for benchmarking in general
3535
# the goal being to limit parallelism on very large servers which may not be respresentative of real-world scenarios
3636
bench_max_threads:: {
37-
restrict_threads:: 36
37+
restrict_threads:: if self.arch == 'amd64' then 36 else 32,
3838
},
3939

4040
bench_no_thread_cap:: {
@@ -99,7 +99,27 @@
9999
default_numa_node:: 0,
100100
num_threads:: 160,
101101
hyperthreading:: false
102-
}
102+
},
103+
hr350a:: common.linux_aarch64 + self._bench_machine + {
104+
machine_name:: "hr350a",
105+
capabilities+: ["tmpfs25g"],
106+
numa_nodes:: [0],
107+
default_numa_node:: 0,
108+
num_threads:: 32,
109+
hyperthreading:: false
110+
},
111+
osprey:: common.linux_aarch64 + self._bench_machine + {
112+
machine_name:: "osprey",
113+
capabilities+: ["tmpfs25g"],
114+
numa_nodes:: [0],
115+
default_numa_node:: 0,
116+
num_threads:: 32,
117+
hyperthreading:: false
118+
},
119+
local contains(a_str, substr) = std.length(std.findSubstr(substr, a_str)) > 0,
120+
# Useful to distribute the benchmark load between two machine types, but always stay consistent for the same benchmark suite
121+
# This guarantees comparability of results, whatever the platform/context, for each suite
122+
hr350a_or_osprey(suite=null):: if suite != null && std.count([contains(s, suite) for s in ["barista", "renaissance"]], true) > 0 then self.osprey else self.hr350a,
103123
},
104124

105125
hwloc_cmd(cmd, num_threads, node, hyperthreading, max_threads_per_node)::

‎ci/graal/ci/common.jsonnet‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -286,18 +286,6 @@ local common_json = import "../common.json";
286286
} else {},
287287
},
288288

289-
truffleruby:: {
290-
packages+: (if self.os == "linux" && self.arch == "amd64" then {
291-
ruby: "==3.2.2", # Newer version, also used for benchmarking
292-
} else if (self.os == "windows") then
293-
error('truffleruby is not supported on windows')
294-
else {
295-
ruby: "==3.0.2",
296-
}) + (if self.os == "linux" then {
297-
libyaml: "==0.2.5",
298-
} else {}),
299-
},
300-
301289
graalnodejs:: {
302290
local this = self,
303291
packages+: if self.os == "linux" then {

‎ci/graal/common.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.68.2",
7+
"mx_version": "7.68.9",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -49,12 +49,12 @@
4949
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5050

5151
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
52-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
53-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
54-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true },
55-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
56-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
57-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true }
52+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b13", "platformspecific": true },
53+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b13-debug", "platformspecific": true },
54+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.1+8-jvmci-25.1-b13-sulong", "platformspecific": true },
55+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b13", "platformspecific": true },
56+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b13-debug", "platformspecific": true },
57+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.1+8-jvmci-25.1-b13-sulong", "platformspecific": true }
5858
},
5959

6060
"eclipse": {

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bdb.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test.test_bdb.BreakpointTestCase.test_ignore_count_on_disabled_bp @ darwin-arm64
1010
test.test_bdb.BreakpointTestCase.test_load_bps_from_previous_Bdb_instance @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1111
test.test_bdb.BreakpointTestCase.test_temporary_bp @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1212
test.test_bdb.IssuesTestCase.test_next_to_botframe @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
13-
test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ darwin-arm64,linux-x86_64,win32-AMD64
13+
test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1414
test.test_bdb.IssuesTestCase.test_step_at_return_with_no_trace_in_caller @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1515
test.test_bdb.RunTestCase.test_run_step @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1616
test.test_bdb.RunTestCase.test_runeval_step @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_functools.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test.test_functools.TestLRUC.test_lru_cache_threaded @ darwin-arm64,linux-aarch6
3636
test.test_functools.TestLRUC.test_lru_cache_threaded2 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
3737
test.test_functools.TestLRUC.test_lru_cache_threaded3 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
3838
test.test_functools.TestLRUC.test_lru_cache_typed_is_not_recursive @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
39-
test.test_functools.TestLRUC.test_lru_cache_weakrefable @ darwin-arm64,linux-x86_64,win32-AMD64
39+
test.test_functools.TestLRUC.test_lru_cache_weakrefable @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
4040
test.test_functools.TestLRUC.test_lru_hash_only_once @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
4141
test.test_functools.TestLRUC.test_lru_method @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
4242
test.test_functools.TestLRUC.test_lru_no_args @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_inspect.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ test.test_inspect.test_inspect.TestPredicates.test_excluding_predicates @ darwin
183183
test.test_inspect.test_inspect.TestPredicates.test_get_slot_members @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
184184
test.test_inspect.test_inspect.TestPredicates.test_isabstract @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
185185
test.test_inspect.test_inspect.TestPredicates.test_isabstract_during_init_subclass @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
186+
test.test_inspect.test_inspect.TestPredicates.test_isawaitable @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
186187
test.test_inspect.test_inspect.TestPredicates.test_isclass @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
187188
test.test_inspect.test_inspect.TestPredicates.test_iscoroutine @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
188189
test.test_inspect.test_inspect.TestPredicates.test_isroutine @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_pdb.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DocTestCase.test.test_pdb.test_list_commands @ darwin-arm64,linux-aarch64,linux-
33
DocTestCase.test.test_pdb.test_next_until_return_at_return_event @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
44
DocTestCase.test.test_pdb.test_pdb_alias_command @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
55
DocTestCase.test.test_pdb.test_pdb_ambiguous_statements @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
6-
DocTestCase.test.test_pdb.test_pdb_basic_commands @ darwin-arm64,linux-x86_64,win32-AMD64
6+
DocTestCase.test.test_pdb.test_pdb_basic_commands @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
77
DocTestCase.test.test_pdb.test_pdb_breakpoint_commands @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
88
DocTestCase.test.test_pdb.test_pdb_breakpoint_on_annotated_function_def @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
99
DocTestCase.test.test_pdb.test_pdb_breakpoints_preserved_across_interactive_sessions @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
@@ -23,7 +23,7 @@ DocTestCase.test.test_pdb.test_pdb_run_with_code_object @ darwin-arm64,linux-aar
2323
DocTestCase.test.test_pdb.test_pdb_skip_modules @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
2424
DocTestCase.test.test_pdb.test_pdb_skip_modules_with_callback @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
2525
DocTestCase.test.test_pdb.test_pdb_whatis_command @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
26-
DocTestCase.test.test_pdb.test_pdb_where_command @ darwin-arm64,linux-x86_64,win32-AMD64
26+
DocTestCase.test.test_pdb.test_pdb_where_command @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
2727
test.test_pdb.ChecklineTests.test_checkline_after_reset @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
2828
test.test_pdb.ChecklineTests.test_checkline_before_debugging @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
2929
test.test_pdb.ChecklineTests.test_checkline_is_not_executable @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_setprofile.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ test.test_sys_setprofile.ProfileHookTestCase.test_distant_exception @ darwin-arm
44
test.test_sys_setprofile.ProfileHookTestCase.test_exception @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
55
test.test_sys_setprofile.ProfileHookTestCase.test_exception_in_except_clause @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_sys_setprofile.ProfileHookTestCase.test_exception_propagation @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
7-
test.test_sys_setprofile.ProfileHookTestCase.test_generator @ darwin-arm64,linux-x86_64,win32-AMD64
7+
test.test_sys_setprofile.ProfileHookTestCase.test_generator @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
88
test.test_sys_setprofile.ProfileHookTestCase.test_nested_exception @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
99
test.test_sys_setprofile.ProfileHookTestCase.test_raise @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1010
test.test_sys_setprofile.ProfileHookTestCase.test_raise_reraise @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1111
test.test_sys_setprofile.ProfileHookTestCase.test_raise_twice @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1212
test.test_sys_setprofile.ProfileHookTestCase.test_simple @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
13-
test.test_sys_setprofile.ProfileHookTestCase.test_stop_iteration @ darwin-arm64,linux-x86_64,win32-AMD64
13+
test.test_sys_setprofile.ProfileHookTestCase.test_stop_iteration @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1414
test.test_sys_setprofile.ProfileSimulatorTestCase.test_basic_exception @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1515
test.test_sys_setprofile.ProfileSimulatorTestCase.test_caught_exception @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
1616
test.test_sys_setprofile.ProfileSimulatorTestCase.test_distant_exception @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unittest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ test.test_unittest.test_suite.Test_TestSuite.test_countTestCases_zero_simple @ d
450450
test.test_unittest.test_suite.Test_TestSuite.test_eq @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
451451
test.test_unittest.test_suite.Test_TestSuite.test_function_in_suite @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
452452
test.test_unittest.test_suite.Test_TestSuite.test_garbage_collect_test_after_run_BaseTestSuite @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
453-
test.test_unittest.test_suite.Test_TestSuite.test_garbage_collect_test_after_run_TestSuite @ darwin-arm64,linux-x86_64,win32-AMD64
453+
test.test_unittest.test_suite.Test_TestSuite.test_garbage_collect_test_after_run_TestSuite @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
454454
test.test_unittest.test_suite.Test_TestSuite.test_init__TestSuite_instances_in_tests @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
455455
test.test_unittest.test_suite.Test_TestSuite.test_init__empty_tests @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
456456
test.test_unittest.test_suite.Test_TestSuite.test_init__tests_from_any_iterable @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_zipfile.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ test.test_zipfile._path.test_path.TestPath.test_open_missing_directory @ darwin-
3636
test.test_zipfile._path.test_path.TestPath.test_open_write @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
3737
test.test_zipfile._path.test_path.TestPath.test_parent @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
3838
test.test_zipfile._path.test_path.TestPath.test_pathlike_construction @ darwin-arm64,linux-aarch64,linux-x86_64
39+
test.test_zipfile._path.test_path.TestPath.test_pickle @ darwin-arm64,linux-aarch64,linux-x86_64
3940
# Times out on Windows in CI
4041
!test.test_zipfile._path.test_path.TestPath.test_pickle @ win32-AMD64
41-
test.test_zipfile._path.test_path.TestPath.test_pickle @ darwin-arm64,linux-aarch64,linux-x86_64
4242
test.test_zipfile._path.test_path.TestPath.test_read @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
4343
test.test_zipfile._path.test_path.TestPath.test_read_does_not_close @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
4444
test.test_zipfile._path.test_path.TestPath.test_relative_to @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
@@ -263,7 +263,7 @@ test.test_zipfile.test_core.StoredTestsWithRandomBinaryFiles.test_open @ darwin-
263263
test.test_zipfile.test_core.StoredTestsWithRandomBinaryFiles.test_random_open @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
264264
test.test_zipfile.test_core.StoredTestsWithRandomBinaryFiles.test_read @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
265265
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_absolute_arcnames @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
266-
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_add_file_after_2107 @ darwin-arm64,win32-AMD64
266+
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_add_file_after_2107 @ darwin-arm64,linux-aarch64,win32-AMD64
267267
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_add_file_before_1980 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
268268
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_append_to_concatenated_zip_file @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
269269
test.test_zipfile.test_core.StoredTestsWithSourceFile.test_append_to_non_zip_file @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

0 commit comments

Comments
 (0)