Skip to content

Commit cc30935

Browse files
authored
Merge pull request #2222 from DARMA-tasking/2209-location-manager-should-use-objgroups
#2209: location manager should use objgroups
2 parents 3200a0e + 179ae19 commit cc30935

File tree

15 files changed

+299
-827
lines changed

15 files changed

+299
-827
lines changed

ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml

Lines changed: 0 additions & 217 deletions
This file was deleted.

ci/build_cpp.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ then
214214
# so it needs special treatment
215215
if test "$GENERATOR" = "Ninja"
216216
then
217+
if test "$CXX" = "nvcc_wrapper"
218+
then
219+
# Limit parallelism to avoid memory exhaustion on Azure runners
220+
dashj="-j 1"
221+
fi
217222
# To easily tell if compilation of given file succeeded special progress bar is used
218223
# (controlled by variable NINJA_STATUS)
219224
export NINJA_STATUS="[ninja][%f/%t] "

examples/lb_data/lb_data_file_example.json

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{
2424
"communications": [
2525
{
26-
"bytes": 160.0,
26+
"bytes": 152.0,
2727
"from": {
2828
"collection_id": 7,
2929
"home": 0,
@@ -66,10 +66,46 @@
6666
"subphases": [
6767
{
6868
"id": 0,
69-
"time": 0.00031375000025946065
69+
"time": 0.0004248750001352164
7070
}
7171
],
72-
"time": 0.00031375000025946065
72+
"time": 0.0004248750001352164
73+
},
74+
{
75+
"entity": {
76+
"home": 0,
77+
"id": 3145740,
78+
"migratable": false,
79+
"objgroup_id": 786435,
80+
"type": "object"
81+
},
82+
"node": 0,
83+
"resource": "cpu",
84+
"time": 0.0
85+
},
86+
{
87+
"entity": {
88+
"home": 0,
89+
"id": 4194316,
90+
"migratable": false,
91+
"objgroup_id": 1048579,
92+
"type": "object"
93+
},
94+
"node": 0,
95+
"resource": "cpu",
96+
"time": 0.0
97+
},
98+
{
99+
"entity": {
100+
"home": 0,
101+
"id": 5242892,
102+
"migratable": false,
103+
"objgroup_id": 1310723,
104+
"type": "object"
105+
},
106+
"node": 0,
107+
"resource": "cpu",
108+
"time": 0.0
73109
},
74110
{
75111
"entity": {
@@ -83,17 +119,17 @@
83119
"subphases": [
84120
{
85121
"id": 0,
86-
"time": 1.1669999366858974e-06
122+
"time": 1.041999894368928e-06
87123
}
88124
],
89-
"time": 1.1669999366858974e-06
125+
"time": 1.041999894368928e-06
90126
},
91127
{
92128
"entity": {
93129
"home": 0,
94-
"id": 3145740,
130+
"id": 6291468,
95131
"migratable": false,
96-
"objgroup_id": 786435,
132+
"objgroup_id": 1572867,
97133
"type": "object"
98134
},
99135
"node": 0,
@@ -103,9 +139,9 @@
103139
{
104140
"entity": {
105141
"home": 0,
106-
"id": 4194316,
142+
"id": 7340044,
107143
"migratable": false,
108-
"objgroup_id": 1048579,
144+
"objgroup_id": 1835011,
109145
"type": "object"
110146
},
111147
"node": 0,
@@ -115,9 +151,9 @@
115151
{
116152
"entity": {
117153
"home": 0,
118-
"id": 5242892,
154+
"id": 8388620,
119155
"migratable": false,
120-
"objgroup_id": 1310723,
156+
"objgroup_id": 2097155,
121157
"type": "object"
122158
},
123159
"node": 0,

scripts/workflows-azure.ini

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,6 @@ vt_pool = 0
6161
vt_extended_tests = 0
6262
vt_debug_verbose = 1
6363

64-
[PR-tests-intel-classic]
65-
test_configuration = "intel icpc, ubuntu, mpich"
66-
compiler_type = intel-oneapi
67-
compiler = icpc
68-
cache_name = ubuntu-intel-oneapi-icpc-cache
69-
output_name = ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
70-
vt_extended_tests = 0
71-
7264
[PR-tests-nvcc-12-2-gcc-9]
7365
test_configuration = "nvidia cuda 12.2.0, gcc-9, ubuntu, mpich, verbose"
7466
compiler_type = nvidia

src/vt/runtime/runtime.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,8 @@ void Runtime::initializeComponents() {
902902
ctx::Context // Everything depends on theContext
903903
>{},
904904
RuntimeDeps<
905-
messaging::ActiveMessenger // Depends on active messenger for sending
905+
messaging::ActiveMessenger, // Depends on active messenger for sending
906+
objgroup::ObjGroupManager // Depends on objgroup since it creates them
906907
>{}
907908
);
908909

0 commit comments

Comments
 (0)