Skip to content

Commit 375db2e

Browse files
authored
Fix ordering issue in call to sst_ser_obj and fix documentation on checkpoint-prefix. (#1313)
1 parent ead5cbd commit 375db2e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/sst/core/config.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ class ConfigHelper
665665
msg.append("\nWithin the checkpoint directory, each checkpoint will create its own subdirectory with "
666666
"a user specified name format (see extended help for --checkpoint-name-format). By default, "
667667
"this is of the form <prefix>_<checkpoint_id>_<simulated_time>, where checkpoint_id starts "
668-
"at 0 and increments by one for each checkpoint. Within this directory, there are three "
668+
"at 1 and increments by one for each checkpoint. Within this directory, there are three "
669669
"types of files:\n\n");
670670

671671
msg.append("Registry file: The file contains a list of some "
@@ -689,16 +689,16 @@ class ConfigHelper
689689
"\"checkpoint\" using two ranks with one thread each would look something like:\n\n"
690690
"output directory\n"
691691
"|--checkpoint\n"
692-
" |--checkpoint_0_1000\n"
693-
" |--checkpoint_0_1000.sstcpt\n"
694-
" |--checkpoint_0_1000_globals.bin\n"
695-
" |--checkpoint_0_1000_0_0.bin\n"
696-
" |--checkpoint_0_1000_1_0.bin\n"
697-
" |--checkpoint_1_2000\n"
698-
" |--checkpoint_1_2000.sstcpt\n"
699-
" |--checkpoint_1_2000_globals.bin\n"
700-
" |--checkpoint_1_2000_0_0.bin\n"
701-
" |--checkpoint_1_2000_1_0.bin\n\n");
692+
" |--checkpoint_1_1000\n"
693+
" |--checkpoint_1_1000.sstcpt\n"
694+
" |--checkpoint_1_1000_globals.bin\n"
695+
" |--checkpoint_1_1000_0_0.bin\n"
696+
" |--checkpoint_1_1000_1_0.bin\n"
697+
" |--checkpoint_2_2000\n"
698+
" |--checkpoint_2_2000.sstcpt\n"
699+
" |--checkpoint_2_2000_globals.bin\n"
700+
" |--checkpoint_2_2000_0_0.bin\n"
701+
" |--checkpoint_2_2000_1_0.bin\n\n");
702702

703703
msg.append("When restarting from a checkpoint, the registry file (*.sstcpt) should be specified as the "
704704
"input file.\n");

src/sst/core/serialization/impl/serialize_array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ template <typename ELEM_T>
5858
void
5959
serialize_array_element(serializer& ser, void* data, ser_opt_t opt, size_t index)
6060
{
61-
sst_ser_object(ser, static_cast<ELEM_T*>(data)[index], nullptr, opt);
61+
sst_ser_object(ser, static_cast<ELEM_T*>(data)[index], opt, nullptr);
6262
}
6363

6464
// Serialize an array map element

0 commit comments

Comments
 (0)