Skip to content

Commit b0381d0

Browse files
committed
rename geomPipeline exe to pppGeomPipeline (diff from geomPipeline.py)
1 parent 2ed8ad4 commit b0381d0

5 files changed

Lines changed: 17 additions & 8 deletions

File tree

src/Geom/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ add_executable(MyGeomMain "GeometryMain.cpp")
4646
add_dependencies(MyGeomMain MyGeom)
4747

4848
target_link_libraries(MyGeomMain MyGeom)
49-
set_target_properties(MyGeomMain PROPERTIES OUTPUT_NAME "geomPipeline")
49+
set_target_properties(MyGeomMain PROPERTIES OUTPUT_NAME "pppGeomPipeline")
5050

5151
if(MSVC)
5252
target_compile_options(MyGeomMain PRIVATE /wd4996 /wd4251)

src/Geom/GeometryMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ int main(int argc, char* argv[])
1111
if (argc < 2)
1212
{
1313
std::cout << "Error: input config file is not provided" << std::endl;
14-
std::cout << "Usage: geomPipeline config.json" << std::endl;
14+
std::cout << "Usage: pppGeomPipeline config.json" << std::endl;
1515
std::terminate();
1616
}
1717
auto p = new Geom::GeometryPipelineController(argc, argv);

src/python/pppStartPipeline.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
"""
55
this enable test for the cases: test after package installed or test in the build folder
6-
using ppp module is importable, otherwise use the executable: geomPipeline
6+
using ppp module is importable, otherwise use the executable: pppGeomPipeline
77
"""
88

99
import shutil
1010
import sys
1111
import os.path
1212

13-
ppp_geom_executable = "geomPipeline"
13+
ppp_geom_executable = "pppGeomPipeline"
1414

1515
try:
1616
import ppp # in case this python module has been installed
@@ -28,10 +28,10 @@
2828
try:
2929
import ppp # in case of running this module in the build folder
3030
except ImportError:
31-
print("parallel-preprocessor python module `ppp` is not installed/importable")
31+
# print("parallel-preprocessor python module `ppp` is not installed/importable")
3232
# print("if not installed, ppp module must be located in build folder")
3333
# print("../lib/ related to this script")
34-
print("start to run `geomPipeline config.json`in an external process")
34+
# print("start to run `pppGeomPipeline config.json`in an external process")
3535
ppp = None
3636

3737
has_ppp_module = bool(ppp)

wiki/Packaging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ First of all, I create release tag, then upload binary package manually (creatin
142142
then run this action to update the package on each push.
143143

144144
```yml
145-
# those release asset filename (is created mannually before running this action)
145+
# those release asset filename (is created manually before running this action)
146146
- name: Upload binary package to release
147147
uses: svenstaro/upload-release-action@v2
148148
with:

wiki/Testing.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
## Testing
2+
3+
### Run all the tests
4+
5+
After out of source build, in the build folder such as `parallel-preprocessor/build/`, run `sh run_all_tests.sh`.
6+
7+
NOTE: unit test application such as `pppGeomTests` must be run in the `build/ppptest` folder for the moment, since test data in `parallel-preprocessor/build/data` are referred using relative path.
8+
9+
### Tested platforms
10+
211
Unit tests are written in C++ to test C++ functions and in Python to test the pipeline.
312

413
Unit tests can be triggered by `run_all_test.sh` in the build dir. This `run_all_test.sh` will make `ppptest` subfolder under the build folder if not yet generated by cmake build system, and copy/link necessary test data for all tests.
@@ -25,7 +34,7 @@ Those python tests script implement `unittest` paradigm; python3-pytest will be
2534

2635
### Continuous integration
2736

28-
Gitlab runners ubuntu and fedora setup within UKAEA
37+
Github CI runners ubuntu and fedora will run all the tests.
2938

3039

3140
### Coverage report in HTML

0 commit comments

Comments
 (0)