Skip to content

Commit f2ab524

Browse files
authored
Merge branch 'develop' into logging_typo_vpicio_mts
2 parents 2888078 + 8deaa79 commit f2ab524

32 files changed

+49
-49
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ perlmutter-metrics:
457457
PDC_TMPDIR: "${CI_BUILDS_DIR}/${CI_PROJECT_NAME}/${CI_JOB_ID}/pdc-tmp-metrics"
458458
PDC_DATA_LOC: "${CI_BUILDS_DIR}/${CI_PROJECT_NAME}/${CI_JOB_ID}/pdc-data-metrics"
459459
PDC_CLIENT_LOOKUP: "NONE"
460-
PDC_SERVER: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/pdc_server.exe"
460+
PDC_SERVER: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/pdc_server"
461461
PDC_SERVER_CLOSE: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/close_server"
462462
PDC_CLIENT: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/vpicio_mts"
463463
PDC_JOB_OUTPUT: "pdc-metrics.log"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ install(
637637

638638
#install(
639639
# FILES
640-
# ${PDC_BINARY_DIR}/bin/pdc_server.exe
640+
# ${PDC_BINARY_DIR}/bin/pdc_server
641641
# ${PDC_BINARY_DIR}/bin/close_server
642642
# DESTINATION
643643
# ${CMAKE_INSTALL_PREFIX}/bin

docs/source/developer-notes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ To run a test, let's lunch pdc_server with 4 cores:
595595
596596
cd $PDC_HOME/build
597597
rm -rf ./pdc_tmp # optional if you need to clean up the PDC tmp directory
598-
srun -N 1 -n 4 -c 2 --mem=25600 --cpu_bind=cores ./bin/pdc_server.exe &
598+
srun -N 1 -n 4 -c 2 --mem=25600 --cpu_bind=cores ./bin/pdc_server &
599599
600600
To debug the client, you can run the following command:
601601

@@ -610,6 +610,6 @@ But if you need to debug the server, you can prepend ``srun`` with ``ddt --conne
610610
611611
cd $PDC_HOME/build
612612
rm -rf ./pdc_tmp # optional if you need to clean up the PDC tmp directory
613-
ddt --connect srun -N 1 -n 4 -c 2 --mem=25600 --cpu_bind=cores ./bin/pdc_server.exe &
613+
ddt --connect srun -N 1 -n 4 -c 2 --mem=25600 --cpu_bind=cores ./bin/pdc_server &
614614
615615
We recommend to use 1 node when debugging PDC, but if memory is not sufficient, you can use more nodes.

docs/source/getting_started.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Run 2 server processes in the background
276276

277277
.. code-block:: Bash
278278
279-
mpiexec -np 2 $PDC_DIR/bin/pdc_server.exe &
279+
mpiexec -np 2 $PDC_DIR/bin/pdc_server &
280280
281281
Run 4 client processes that concurrently create 1000 objects and then create and query 1000 tags:
282282

@@ -291,7 +291,7 @@ Run 4 server processes, each on one compute node in the background:
291291

292292
.. code-block:: Bash
293293
294-
srun -N 4 -n 4 -c 2 --mem=25600 --cpu_bind=cores $PDC_DIR/bin/pdc_server.exe &
294+
srun -N 4 -n 4 -c 2 --mem=25600 --cpu_bind=cores $PDC_DIR/bin/pdc_server &
295295
296296
Run 64 client processes that concurrently create 1000 objects and then create and query 100000 tags:
297297

docs/source/hdf5vol.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To compile and run examples:
4545
$ cd vol-pdc/examples
4646
$ cmake .
4747
$ make
48-
$ mpirun -N 1 -n 1 -c 1 <pdc installation directory>/bin/pdc_server.exe &
48+
$ mpirun -N 1 -n 1 -c 1 <pdc installation directory>/bin/pdc_server &
4949
$ mpirun -N 1 -n 1 -c 1 ./h5pdc_vpicio test
5050
$ mpirun -N 1 -n 1 -c 1 <pdc installation directory>/bin/close_server
5151

docs/source/tools.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Examples:
163163

164164
.. code-block:: Bash
165165
166-
$ srun -N 1 -n 1 -c 2 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap /path/to/pdc_server.exe &
166+
$ srun -N 1 -n 1 -c 2 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap /path/to/pdc_server &
167167
==PDC_SERVER[0]: using [./pdc_tmp/] as tmp dir, 1 OSTs, 1 OSTs per data file, 0% to BB
168168
==PDC_SERVER[0]: using ofi+tcp
169169
==PDC_SERVER[0]: without multi-thread!
@@ -201,7 +201,7 @@ Examples:
201201

202202
.. code-block:: Bash
203203
204-
$ srun -N 1 -n 1 -c 2 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap /path/to/pdc_server.exe &
204+
$ srun -N 1 -n 1 -c 2 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap /path/to/pdc_server &
205205
==PDC_SERVER[0]: using [./pdc_tmp/] as tmp dir, 1 OSTs, 1 OSTs per data file, 0% to BB
206206
==PDC_SERVER[0]: using ofi+tcp
207207
==PDC_SERVER[0]: without multi-thread!

examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
+ This multidataset_plugin implementation is designed for wrapping HDF5 operations and call HDF5 multidataset. We demonstrate that PDC can substitute a storage structure comparable to HDF5. Therefore, it is possible to make direct comparison between these two. Currently, only write is implemented in this example.
8282
```
8383
0. cd C_plus_plus_example;make
84-
1. mpiexec -n 1 ./pdc_server.exe &
84+
1. mpiexec -n 1 ./pdc_server &
8585
2. mpiexec -n 1 ./region_transfer_1D_append
8686
```

examples/llsm/LLSM_IMPORTER.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ cd $WORK_SPACE/source/pdc/scripts/llsm_importer
5858

5959
Modify the template script `template.sh`.
6060

61-
Change `EXECPATH` to where your `pdc_server.exe` is installed
61+
Change `EXECPATH` to where your `pdc_server` is installed
6262
Change `TOOLPATH` to where your `llsm_importer` artifact is.
6363

6464
Change `LLSM_DATA_PATH` to where your sample dataset is. For exmaple,

examples/mpi_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ echo $test_args
2222
if [ -x $test_exe ]; then echo "testing: $test_exe"; else echo "test: $test_exe not found or not and executable" && exit -2; fi
2323
rm -rf pdc_tmp pdc_data
2424
# START the server (in the background)
25-
echo "$mpi_cmd -n $n_servers $extra_cmd ./pdc_server.exe &"
26-
$mpi_cmd -n $n_servers $extra_cmd ./pdc_server.exe &
25+
echo "$mpi_cmd -n $n_servers $extra_cmd ./pdc_server &"
26+
$mpi_cmd -n $n_servers $extra_cmd ./pdc_server &
2727
# WAIT a bit, for 1 second
2828
sleep 1
2929
# RUN the actual test

examples/multiple_mpi_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ n_client="$5"
2222
test_args="$6 $7 $8"
2323
# if [ -x $test_exe ]; then echo "testing: $test_exe"; else echo "test: $test_exe not found or not and executable" && exit -2; fi
2424
# START the server (in the background)
25-
echo "$mpi_cmd -n $n_servers $extra_cmd ./pdc_server.exe &"
26-
$mpi_cmd -n $n_servers $extra_cmd $PDC_DIR/bin/./pdc_server.exe &
25+
echo "$mpi_cmd -n $n_servers $extra_cmd ./pdc_server &"
26+
$mpi_cmd -n $n_servers $extra_cmd $PDC_DIR/bin/./pdc_server &
2727
# WAIT a bit...
2828
sleep 1
2929
# RUN the actual test(s)

0 commit comments

Comments
 (0)