From e91da9e6816dfc7afb311ac709b244c44d8ad2d3 Mon Sep 17 00:00:00 2001 From: Vladislav Tsendrovskii Date: Tue, 29 Oct 2024 05:11:48 +0100 Subject: [PATCH] Move C/C++ code to src/c_modules path --- setup.py | 26 +++++++++---------- .../clusterization/lib/CMakeLists.txt | 0 .../clusterization/lib/include/clusters.hpp | 0 .../clusterization/lib/run_valgrind_tests.sh | 0 .../clusterization/lib/src/clusters.cc | 0 .../clusterization/lib/tests/clusters_test.cc | 0 .../clusterization/module.cc | 0 .../libimagedeform/CMakeLists.txt | 0 .../libimagedeform/include/image_deform.h | 0 .../libimagedeform/include/image_deform_gc.h | 0 .../libimagedeform/include/image_deform_lc.h | 0 .../libimagedeform/include/image_grid.h | 0 .../libimagedeform/include/interpolation.h | 0 .../libimagedeform/run_valgrind_tests.sh | 0 .../libimagedeform/src/image_deform.c | 0 .../libimagedeform/src/image_deform_gc.c | 0 .../libimagedeform/src/image_deform_lc.c | 0 .../libimagedeform/src/image_grid.c | 0 .../libimagedeform/src/interpolation.c | 0 .../libimagedeform/tests/deform_test.cc | 0 .../libimagedeform/tests/deform_test_gc.cc | 0 .../fine_movement/module/imagedeform.c | 0 .../fine_movement/module/imagedeform.h | 0 .../fine_movement/module/imagedeform_gc.c | 0 .../fine_movement/module/imagedeform_gc.h | 0 .../fine_movement/module/imagedeform_lc.c | 0 .../fine_movement/module/imagedeform_lc.h | 0 .../fine_movement/module/imagedeform_module.c | 0 .../fine_movement/module/imagegrid.c | 0 .../fine_movement/module/imagegrid.h | 0 .../movements/lib/flat.c | 0 .../movements/lib/flat.h | 0 .../movements/lib/sphere.c | 0 .../movements/lib/sphere.h | 0 .../movement => c_modules}/movements/module.c | 0 .../projections/lib/equirectangular.c | 0 .../projections/lib/equirectangular.h | 0 .../projections/lib/orthographic.c | 0 .../projections/lib/orthographic.h | 0 .../projections/lib/perspective.c | 0 .../projections/lib/perspective.h | 0 .../projections/lib/projection.h | 0 .../projections/lib/projection_common.h | 0 .../projections/module.c | 0 .../projections/projection_module.h | 0 45 files changed, 13 insertions(+), 13 deletions(-) rename src/{vstarstack/library/clusters => c_modules}/clusterization/lib/CMakeLists.txt (100%) rename src/{vstarstack/library/clusters => c_modules}/clusterization/lib/include/clusters.hpp (100%) rename src/{vstarstack/library/clusters => c_modules}/clusterization/lib/run_valgrind_tests.sh (100%) rename src/{vstarstack/library/clusters => c_modules}/clusterization/lib/src/clusters.cc (100%) rename src/{vstarstack/library/clusters => c_modules}/clusterization/lib/tests/clusters_test.cc (100%) rename src/{vstarstack/library/clusters => c_modules}/clusterization/module.cc (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/CMakeLists.txt (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/include/image_deform.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/include/image_deform_gc.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/include/image_deform_lc.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/include/image_grid.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/include/interpolation.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/run_valgrind_tests.sh (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/src/image_deform.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/src/image_deform_gc.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/src/image_deform_lc.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/src/image_grid.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/src/interpolation.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/tests/deform_test.cc (100%) rename src/{vstarstack/library => c_modules}/fine_movement/libimagedeform/tests/deform_test_gc.cc (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform_gc.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform_gc.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform_lc.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform_lc.h (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagedeform_module.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagegrid.c (100%) rename src/{vstarstack/library => c_modules}/fine_movement/module/imagegrid.h (100%) rename src/{vstarstack/library/movement => c_modules}/movements/lib/flat.c (100%) rename src/{vstarstack/library/movement => c_modules}/movements/lib/flat.h (100%) rename src/{vstarstack/library/movement => c_modules}/movements/lib/sphere.c (100%) rename src/{vstarstack/library/movement => c_modules}/movements/lib/sphere.h (100%) rename src/{vstarstack/library/movement => c_modules}/movements/module.c (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/equirectangular.c (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/equirectangular.h (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/orthographic.c (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/orthographic.h (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/perspective.c (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/perspective.h (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/projection.h (100%) rename src/{vstarstack/library/projection => c_modules}/projections/lib/projection_common.h (100%) rename src/{vstarstack/library/projection => c_modules}/projections/module.c (100%) rename src/{vstarstack/library/projection => c_modules}/projections/projection_module.h (100%) diff --git a/setup.py b/setup.py index b003e4b7..930f3dbc 100644 --- a/setup.py +++ b/setup.py @@ -18,33 +18,33 @@ clusterization = Extension(name="vstarstack.library.clusters.clusterization", sources=[ - "src/vstarstack/library/clusters/clusterization/module.cc", - "src/vstarstack/library/clusters/clusterization/lib/src/clusters.cc" + "src/c_modules/clusterization/module.cc", + "src/c_modules/clusterization/lib/src/clusters.cc" ], include_dirs=[ - "src/vstarstack/library/clusters/clusterization/lib/include" + "src/c_modules/clusterization/lib/include" ]) projection = Extension( name="vstarstack.library.projection.projections", sources=[ - "src/vstarstack/library/projection/projections/module.c", - "src/vstarstack/library/projection/projections/lib/perspective.c", - "src/vstarstack/library/projection/projections/lib/orthographic.c", - "src/vstarstack/library/projection/projections/lib/equirectangular.c", + "src/c_modules/projections/module.c", + "src/c_modules/projections/lib/perspective.c", + "src/c_modules/projections/lib/orthographic.c", + "src/c_modules/projections/lib/equirectangular.c", ]) movements = Extension( name="vstarstack.library.movement.movements", sources=[ - "src/vstarstack/library/movement/movements/module.c", - "src/vstarstack/library/movement/movements/lib/sphere.c", - "src/vstarstack/library/movement/movements/lib/flat.c", + "src/c_modules/movements/module.c", + "src/c_modules/movements/lib/sphere.c", + "src/c_modules/movements/lib/flat.c", ], include_dirs=[ - "src/vstarstack/library/projection/projections", + "src/c_modules/projections", np.get_include(), ]) -libimagedeform_root = "src/vstarstack/library/fine_movement/libimagedeform" +libimagedeform_root = "src/c_modules/fine_movement/libimagedeform" libimagedeform_headers = [libimagedeform_root + "/include"] libimagedeform_sources = [libimagedeform_root + "/src/interpolation.c", libimagedeform_root + "/src/image_grid.c", @@ -53,7 +53,7 @@ libimagedeform_root + "/src/image_deform_lc.c", ] -imagedeform_root = "src/vstarstack/library/fine_movement/module" +imagedeform_root = "src/c_modules/fine_movement/module" imagedeform_sources = [imagedeform_root + "/imagegrid.c", imagedeform_root + "/imagedeform.c", imagedeform_root + "/imagedeform_gc.c", diff --git a/src/vstarstack/library/clusters/clusterization/lib/CMakeLists.txt b/src/c_modules/clusterization/lib/CMakeLists.txt similarity index 100% rename from src/vstarstack/library/clusters/clusterization/lib/CMakeLists.txt rename to src/c_modules/clusterization/lib/CMakeLists.txt diff --git a/src/vstarstack/library/clusters/clusterization/lib/include/clusters.hpp b/src/c_modules/clusterization/lib/include/clusters.hpp similarity index 100% rename from src/vstarstack/library/clusters/clusterization/lib/include/clusters.hpp rename to src/c_modules/clusterization/lib/include/clusters.hpp diff --git a/src/vstarstack/library/clusters/clusterization/lib/run_valgrind_tests.sh b/src/c_modules/clusterization/lib/run_valgrind_tests.sh similarity index 100% rename from src/vstarstack/library/clusters/clusterization/lib/run_valgrind_tests.sh rename to src/c_modules/clusterization/lib/run_valgrind_tests.sh diff --git a/src/vstarstack/library/clusters/clusterization/lib/src/clusters.cc b/src/c_modules/clusterization/lib/src/clusters.cc similarity index 100% rename from src/vstarstack/library/clusters/clusterization/lib/src/clusters.cc rename to src/c_modules/clusterization/lib/src/clusters.cc diff --git a/src/vstarstack/library/clusters/clusterization/lib/tests/clusters_test.cc b/src/c_modules/clusterization/lib/tests/clusters_test.cc similarity index 100% rename from src/vstarstack/library/clusters/clusterization/lib/tests/clusters_test.cc rename to src/c_modules/clusterization/lib/tests/clusters_test.cc diff --git a/src/vstarstack/library/clusters/clusterization/module.cc b/src/c_modules/clusterization/module.cc similarity index 100% rename from src/vstarstack/library/clusters/clusterization/module.cc rename to src/c_modules/clusterization/module.cc diff --git a/src/vstarstack/library/fine_movement/libimagedeform/CMakeLists.txt b/src/c_modules/fine_movement/libimagedeform/CMakeLists.txt similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/CMakeLists.txt rename to src/c_modules/fine_movement/libimagedeform/CMakeLists.txt diff --git a/src/vstarstack/library/fine_movement/libimagedeform/include/image_deform.h b/src/c_modules/fine_movement/libimagedeform/include/image_deform.h similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/include/image_deform.h rename to src/c_modules/fine_movement/libimagedeform/include/image_deform.h diff --git a/src/vstarstack/library/fine_movement/libimagedeform/include/image_deform_gc.h b/src/c_modules/fine_movement/libimagedeform/include/image_deform_gc.h similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/include/image_deform_gc.h rename to src/c_modules/fine_movement/libimagedeform/include/image_deform_gc.h diff --git a/src/vstarstack/library/fine_movement/libimagedeform/include/image_deform_lc.h b/src/c_modules/fine_movement/libimagedeform/include/image_deform_lc.h similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/include/image_deform_lc.h rename to src/c_modules/fine_movement/libimagedeform/include/image_deform_lc.h diff --git a/src/vstarstack/library/fine_movement/libimagedeform/include/image_grid.h b/src/c_modules/fine_movement/libimagedeform/include/image_grid.h similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/include/image_grid.h rename to src/c_modules/fine_movement/libimagedeform/include/image_grid.h diff --git a/src/vstarstack/library/fine_movement/libimagedeform/include/interpolation.h b/src/c_modules/fine_movement/libimagedeform/include/interpolation.h similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/include/interpolation.h rename to src/c_modules/fine_movement/libimagedeform/include/interpolation.h diff --git a/src/vstarstack/library/fine_movement/libimagedeform/run_valgrind_tests.sh b/src/c_modules/fine_movement/libimagedeform/run_valgrind_tests.sh similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/run_valgrind_tests.sh rename to src/c_modules/fine_movement/libimagedeform/run_valgrind_tests.sh diff --git a/src/vstarstack/library/fine_movement/libimagedeform/src/image_deform.c b/src/c_modules/fine_movement/libimagedeform/src/image_deform.c similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/src/image_deform.c rename to src/c_modules/fine_movement/libimagedeform/src/image_deform.c diff --git a/src/vstarstack/library/fine_movement/libimagedeform/src/image_deform_gc.c b/src/c_modules/fine_movement/libimagedeform/src/image_deform_gc.c similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/src/image_deform_gc.c rename to src/c_modules/fine_movement/libimagedeform/src/image_deform_gc.c diff --git a/src/vstarstack/library/fine_movement/libimagedeform/src/image_deform_lc.c b/src/c_modules/fine_movement/libimagedeform/src/image_deform_lc.c similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/src/image_deform_lc.c rename to src/c_modules/fine_movement/libimagedeform/src/image_deform_lc.c diff --git a/src/vstarstack/library/fine_movement/libimagedeform/src/image_grid.c b/src/c_modules/fine_movement/libimagedeform/src/image_grid.c similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/src/image_grid.c rename to src/c_modules/fine_movement/libimagedeform/src/image_grid.c diff --git a/src/vstarstack/library/fine_movement/libimagedeform/src/interpolation.c b/src/c_modules/fine_movement/libimagedeform/src/interpolation.c similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/src/interpolation.c rename to src/c_modules/fine_movement/libimagedeform/src/interpolation.c diff --git a/src/vstarstack/library/fine_movement/libimagedeform/tests/deform_test.cc b/src/c_modules/fine_movement/libimagedeform/tests/deform_test.cc similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/tests/deform_test.cc rename to src/c_modules/fine_movement/libimagedeform/tests/deform_test.cc diff --git a/src/vstarstack/library/fine_movement/libimagedeform/tests/deform_test_gc.cc b/src/c_modules/fine_movement/libimagedeform/tests/deform_test_gc.cc similarity index 100% rename from src/vstarstack/library/fine_movement/libimagedeform/tests/deform_test_gc.cc rename to src/c_modules/fine_movement/libimagedeform/tests/deform_test_gc.cc diff --git a/src/vstarstack/library/fine_movement/module/imagedeform.c b/src/c_modules/fine_movement/module/imagedeform.c similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform.c rename to src/c_modules/fine_movement/module/imagedeform.c diff --git a/src/vstarstack/library/fine_movement/module/imagedeform.h b/src/c_modules/fine_movement/module/imagedeform.h similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform.h rename to src/c_modules/fine_movement/module/imagedeform.h diff --git a/src/vstarstack/library/fine_movement/module/imagedeform_gc.c b/src/c_modules/fine_movement/module/imagedeform_gc.c similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform_gc.c rename to src/c_modules/fine_movement/module/imagedeform_gc.c diff --git a/src/vstarstack/library/fine_movement/module/imagedeform_gc.h b/src/c_modules/fine_movement/module/imagedeform_gc.h similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform_gc.h rename to src/c_modules/fine_movement/module/imagedeform_gc.h diff --git a/src/vstarstack/library/fine_movement/module/imagedeform_lc.c b/src/c_modules/fine_movement/module/imagedeform_lc.c similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform_lc.c rename to src/c_modules/fine_movement/module/imagedeform_lc.c diff --git a/src/vstarstack/library/fine_movement/module/imagedeform_lc.h b/src/c_modules/fine_movement/module/imagedeform_lc.h similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform_lc.h rename to src/c_modules/fine_movement/module/imagedeform_lc.h diff --git a/src/vstarstack/library/fine_movement/module/imagedeform_module.c b/src/c_modules/fine_movement/module/imagedeform_module.c similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagedeform_module.c rename to src/c_modules/fine_movement/module/imagedeform_module.c diff --git a/src/vstarstack/library/fine_movement/module/imagegrid.c b/src/c_modules/fine_movement/module/imagegrid.c similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagegrid.c rename to src/c_modules/fine_movement/module/imagegrid.c diff --git a/src/vstarstack/library/fine_movement/module/imagegrid.h b/src/c_modules/fine_movement/module/imagegrid.h similarity index 100% rename from src/vstarstack/library/fine_movement/module/imagegrid.h rename to src/c_modules/fine_movement/module/imagegrid.h diff --git a/src/vstarstack/library/movement/movements/lib/flat.c b/src/c_modules/movements/lib/flat.c similarity index 100% rename from src/vstarstack/library/movement/movements/lib/flat.c rename to src/c_modules/movements/lib/flat.c diff --git a/src/vstarstack/library/movement/movements/lib/flat.h b/src/c_modules/movements/lib/flat.h similarity index 100% rename from src/vstarstack/library/movement/movements/lib/flat.h rename to src/c_modules/movements/lib/flat.h diff --git a/src/vstarstack/library/movement/movements/lib/sphere.c b/src/c_modules/movements/lib/sphere.c similarity index 100% rename from src/vstarstack/library/movement/movements/lib/sphere.c rename to src/c_modules/movements/lib/sphere.c diff --git a/src/vstarstack/library/movement/movements/lib/sphere.h b/src/c_modules/movements/lib/sphere.h similarity index 100% rename from src/vstarstack/library/movement/movements/lib/sphere.h rename to src/c_modules/movements/lib/sphere.h diff --git a/src/vstarstack/library/movement/movements/module.c b/src/c_modules/movements/module.c similarity index 100% rename from src/vstarstack/library/movement/movements/module.c rename to src/c_modules/movements/module.c diff --git a/src/vstarstack/library/projection/projections/lib/equirectangular.c b/src/c_modules/projections/lib/equirectangular.c similarity index 100% rename from src/vstarstack/library/projection/projections/lib/equirectangular.c rename to src/c_modules/projections/lib/equirectangular.c diff --git a/src/vstarstack/library/projection/projections/lib/equirectangular.h b/src/c_modules/projections/lib/equirectangular.h similarity index 100% rename from src/vstarstack/library/projection/projections/lib/equirectangular.h rename to src/c_modules/projections/lib/equirectangular.h diff --git a/src/vstarstack/library/projection/projections/lib/orthographic.c b/src/c_modules/projections/lib/orthographic.c similarity index 100% rename from src/vstarstack/library/projection/projections/lib/orthographic.c rename to src/c_modules/projections/lib/orthographic.c diff --git a/src/vstarstack/library/projection/projections/lib/orthographic.h b/src/c_modules/projections/lib/orthographic.h similarity index 100% rename from src/vstarstack/library/projection/projections/lib/orthographic.h rename to src/c_modules/projections/lib/orthographic.h diff --git a/src/vstarstack/library/projection/projections/lib/perspective.c b/src/c_modules/projections/lib/perspective.c similarity index 100% rename from src/vstarstack/library/projection/projections/lib/perspective.c rename to src/c_modules/projections/lib/perspective.c diff --git a/src/vstarstack/library/projection/projections/lib/perspective.h b/src/c_modules/projections/lib/perspective.h similarity index 100% rename from src/vstarstack/library/projection/projections/lib/perspective.h rename to src/c_modules/projections/lib/perspective.h diff --git a/src/vstarstack/library/projection/projections/lib/projection.h b/src/c_modules/projections/lib/projection.h similarity index 100% rename from src/vstarstack/library/projection/projections/lib/projection.h rename to src/c_modules/projections/lib/projection.h diff --git a/src/vstarstack/library/projection/projections/lib/projection_common.h b/src/c_modules/projections/lib/projection_common.h similarity index 100% rename from src/vstarstack/library/projection/projections/lib/projection_common.h rename to src/c_modules/projections/lib/projection_common.h diff --git a/src/vstarstack/library/projection/projections/module.c b/src/c_modules/projections/module.c similarity index 100% rename from src/vstarstack/library/projection/projections/module.c rename to src/c_modules/projections/module.c diff --git a/src/vstarstack/library/projection/projections/projection_module.h b/src/c_modules/projections/projection_module.h similarity index 100% rename from src/vstarstack/library/projection/projections/projection_module.h rename to src/c_modules/projections/projection_module.h