Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SPINS_main
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
spaceforce
SPINS_main
Commits
3f358dcb
Commit
3f358dcb
authored
1 year ago
by
Derek Steinmoeller
Browse files
Options
Downloads
Patches
Plain Diff
Missed src/Splits.cpp conflict somehow.
parent
bdff0037
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Splits.cpp
+0
-11
0 additions, 11 deletions
src/Splits.cpp
with
0 additions
and
11 deletions
src/Splits.cpp
+
0
−
11
View file @
3f358dcb
...
...
@@ -121,24 +121,14 @@ src_temp(0), dst_temp(0), issue_warning(true) {
rec_types
.
resize
(
num_proc
);
// make sure our vector can hold everything
for
(
int
i
=
0
;
i
<
num_proc
;
i
++
)
{
<<<<<<<
HEAD
// We'll have to use the MPI_Type_struct syntax, so build arrays:
MPI_Datatype
types
[
1
]
=
{
vec_type
};
=======
/*// We'll have to use the MPI_Type_struct syntax, so build arrays:
MPI_Datatype types[2] = {vec_type,MPI_UB};
>>>>>>> upstream/master
int counts[2]; counts[0] = extent_from[i]; counts[1] = 1;
// Now, set displacements to set the "end" of the datatype a full
// "row" ahead of the partial row received.
MPI_Aint displs[2] = {0,sizeof(T)*sizes[untouched_dim]*sizes[from_dim]};
// And make the type
<<<<<<< HEAD
MPI_Type_create_struct(1, counts, displs, types, &rec_types[i]);
=======
MPI_Type_struct(2,counts,displs,types,&rec_types[i]);*/
// This code formerly used the MPI_UB marker to define the upper bound
...
...
@@ -154,7 +144,6 @@ src_temp(0), dst_temp(0), issue_warning(true) {
sizeof
(
T
)
*
sizes
[
untouched_dim
]
*
sizes
[
from_dim
],
// extent
&
rec_types
[
i
]);
// new type
>>>>>>>
upstream
/
master
MPI_Type_commit
(
&
rec_types
[
i
]);
MPI_Type_free
(
&
multivec
);
/* Impelementation note: one optimization possible here is to collapse
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment