From 7e74b774f75c95b7fa7e83154398d70feaa78c95 Mon Sep 17 00:00:00 2001 From: Hongli Lin Date: Wed, 6 Dec 2023 08:47:12 +0000 Subject: [PATCH 1/3] fix: remove lint-related codes --- example/balance/Makefile.am | 6 ------ example/mesh/Makefile.am | 4 ---- example/particles/Makefile.am | 4 ---- example/points/Makefile.am | 2 -- example/search/Makefile.am | 6 ------ example/simple/Makefile.am | 4 ---- example/spheres/Makefile.am | 4 ---- example/steps/Makefile.am | 14 +------------- example/tetgen/Makefile.am | 7 ------- example/timings/Makefile.am | 11 ----------- 10 files changed, 1 insertion(+), 61 deletions(-) diff --git a/example/balance/Makefile.am b/example/balance/Makefile.am index 9372ab3cd..8fe31bcf1 100644 --- a/example/balance/Makefile.am +++ b/example/balance/Makefile.am @@ -11,9 +11,6 @@ example_balance_p4est_balance_seeds_SOURCES = \ example/balance/balance_seeds2.c example_balance_p4est_balance_corner_SOURCES = \ example/balance/balance_corner2.c - -LINT_CSOURCES += \ - $(example_balance_p4est_balance_seeds_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -24,7 +21,4 @@ example_balance_p8est_balance_seeds_SOURCES = \ example/balance/balance_seeds3.c example_balance_p8est_balance_corner_SOURCES = \ example/balance/balance_corner3.c - -LINT_CSOURCES += \ - $(example_balance_p8est_balance_seeds_SOURCES) endif diff --git a/example/mesh/Makefile.am b/example/mesh/Makefile.am index 949e2431b..9a237a55b 100644 --- a/example/mesh/Makefile.am +++ b/example/mesh/Makefile.am @@ -6,8 +6,6 @@ if P4EST_ENABLE_BUILD_2D bin_PROGRAMS += example/mesh/p4est_mesh example_mesh_p4est_mesh_SOURCES = example/mesh/mesh2.c - -LINT_CSOURCES += $(example_mesh_p4est_mesh_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -16,6 +14,4 @@ bin_PROGRAMS += example/mesh/p8est_mesh \ example_mesh_p8est_mesh_SOURCES = example/mesh/mesh3.c example_mesh_p8est_periodicity_SOURCES = example/mesh/periodicity3.c - -LINT_CSOURCES += $(example_mesh_p8est_mesh_SOURCES) endif diff --git a/example/particles/Makefile.am b/example/particles/Makefile.am index 96c62218a..bdbc0d9f2 100644 --- a/example/particles/Makefile.am +++ b/example/particles/Makefile.am @@ -9,8 +9,6 @@ bin_PROGRAMS += \ example_particles_p4est_particles_SOURCES = \ example/particles/particles_global.h \ example/particles/particles2.c - -LINT_CSOURCES += $(example_particles_p4est_particles_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -19,8 +17,6 @@ bin_PROGRAMS += \ example_particles_p8est_particles_SOURCES = \ example/particles/particles_global.h \ example/particles/particles3.c - -LINT_CSOURCES += $(example_particles_p8est_particles_SOURCES) endif ## from example/steps for future reference diff --git a/example/points/Makefile.am b/example/points/Makefile.am index 5518a674e..b0139ecae 100644 --- a/example/points/Makefile.am +++ b/example/points/Makefile.am @@ -10,7 +10,6 @@ example_points_p4est_points_SOURCES = example/points/points2.c bin_PROGRAMS += example/points/p4est_points_generate example_points_p4est_points_generate_SOURCES = example/points/generate_points2.c -LINT_CSOURCES += $(example_points_p4est_points_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -20,5 +19,4 @@ example_points_p8est_points_SOURCES = example/points/points3.c bin_PROGRAMS += example/points/p8est_points_generate example_points_p8est_points_generate_SOURCES = example/points/generate_points3.c -LINT_CSOURCES += $(example_points_p8est_points_SOURCES) endif diff --git a/example/search/Makefile.am b/example/search/Makefile.am index 2f14d59a6..0ca6bf6fd 100644 --- a/example/search/Makefile.am +++ b/example/search/Makefile.am @@ -8,9 +8,6 @@ bin_PROGRAMS += example/search/p4est_count_quadrants example_search_p4est_count_quadrants_SOURCES = \ example/search/count_quadrants2.c - -LINT_CSOURCES += \ - $(example_search_p4est_count_quadrants_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -18,7 +15,4 @@ bin_PROGRAMS += example/search/p8est_count_quadrants example_search_p8est_count_quadrants_SOURCES = \ example/search/count_quadrants3.c - -LINT_CSOURCES += \ - $(example_search_p8est_count_quadrants_SOURCES) endif diff --git a/example/simple/Makefile.am b/example/simple/Makefile.am index 9c78f66b7..d283b8c7d 100644 --- a/example/simple/Makefile.am +++ b/example/simple/Makefile.am @@ -6,13 +6,9 @@ if P4EST_ENABLE_BUILD_2D bin_PROGRAMS += example/simple/p4est_simple example_simple_p4est_simple_SOURCES = example/simple/simple2.c - -LINT_CSOURCES += $(example_simple_p4est_simple_SOURCES) endif if P4EST_ENABLE_BUILD_3D bin_PROGRAMS += example/simple/p8est_simple example_simple_p8est_simple_SOURCES = example/simple/simple3.c - -LINT_CSOURCES += $(example_simple_p8est_simple_SOURCES) endif diff --git a/example/spheres/Makefile.am b/example/spheres/Makefile.am index 3209c71ca..06367cf6b 100644 --- a/example/spheres/Makefile.am +++ b/example/spheres/Makefile.am @@ -17,8 +17,6 @@ bin_PROGRAMS += \ example_spheres_p4est_spheres_SOURCES = \ example/spheres/spheres_global.h \ example/spheres/spheres2.c - -LINT_CSOURCES += $(example_spheres_p4est_spheres_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -35,8 +33,6 @@ bin_PROGRAMS += \ example_spheres_p8est_spheres_SOURCES = \ example/spheres/spheres_global.h \ example/spheres/spheres3.c - -LINT_CSOURCES += $(example_spheres_p8est_spheres_SOURCES) endif ## from example/steps for future reference diff --git a/example/steps/Makefile.am b/example/steps/Makefile.am index 39431caf4..435ac7108 100644 --- a/example/steps/Makefile.am +++ b/example/steps/Makefile.am @@ -15,12 +15,6 @@ example_steps_p4est_step2_SOURCES = example/steps/p4est_step2.c example_steps_p4est_step3_SOURCES = example/steps/p4est_step3.c example_steps_p4est_step4_SOURCES = example/steps/p4est_step4.c example_steps_p4est_step5_SOURCES = example/steps/p4est_step5.c - -LINT_CSOURCES += $(example_steps_p4est_step1_SOURCES) \ - $(example_steps_p4est_step2_SOURCES) \ - $(example_steps_p4est_step3_SOURCES) \ - $(example_steps_p4est_step4_SOURCES) \ - $(example_steps_p4est_step5_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -35,16 +29,10 @@ example_steps_p8est_step2_SOURCES = example/steps/p8est_step2.c example_steps_p8est_step3_SOURCES = example/steps/p8est_step3.c example_steps_p8est_step4_SOURCES = example/steps/p8est_step4.c example_steps_p8est_step5_SOURCES = example/steps/p8est_step5.c - -LINT_CSOURCES += $(example_steps_p8est_step1_SOURCES) \ - $(example_steps_p8est_step2_SOURCES) \ - $(example_steps_p8est_step3_SOURCES) \ - $(example_steps_p8est_step4_SOURCES) \ - $(example_steps_p8est_step5_SOURCES) endif EXTRA_DIST += \ - example/steps/hw32.h + example/steps/hw32.h dist_p4estdata_DATA += \ example/steps/hole_2d_cubit.inp \ diff --git a/example/tetgen/Makefile.am b/example/tetgen/Makefile.am index dca21d8bd..13f627a63 100644 --- a/example/tetgen/Makefile.am +++ b/example/tetgen/Makefile.am @@ -12,9 +12,6 @@ bin_PROGRAMS += \ example/tetgen/p4est_write_conn example/tetgen/p4est_read_conn example_tetgen_p4est_write_conn_SOURCES = example/tetgen/write_conn2.c example_tetgen_p4est_read_conn_SOURCES = example/tetgen/read_conn2.c - -LINT_CSOURCES += $(example_tetgen_p4est_write_conn_SOURCES) \ - $(example_tetgen_p4est_read_conn_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -24,8 +21,4 @@ bin_PROGRAMS += \ example_tetgen_p8est_write_conn_SOURCES = example/tetgen/write_conn3.c example_tetgen_p8est_read_conn_SOURCES = example/tetgen/read_conn3.c example_tetgen_p8est_read_tetgen_SOURCES = example/tetgen/read_tetgen.c - -LINT_CSOURCES += $(example_tetgen_p8est_write_conn_SOURCES) \ - $(example_tetgen_p8est_read_conn_SOURCES) \ - $(example_tetgen_p8est_read_tetgen_SOURCES) endif diff --git a/example/timings/Makefile.am b/example/timings/Makefile.am index 2bf9976c6..c8952fff9 100644 --- a/example/timings/Makefile.am +++ b/example/timings/Makefile.am @@ -12,11 +12,6 @@ bin_PROGRAMS += \ example_timings_p4est_timings_SOURCES = example/timings/timings2.c example_timings_p4est_bricks_SOURCES = example/timings/bricks2.c example_timings_p4est_loadconn_SOURCES = example/timings/loadconn2.c - -LINT_CSOURCES += \ - $(example_timings_p4est_timings_SOURCES) \ - $(example_timings_p4est_bricks_SOURCES) \ - $(example_timings_p4est_loadconn_SOURCES) endif if P4EST_ENABLE_BUILD_3D @@ -30,12 +25,6 @@ example_timings_p8est_timings_SOURCES = example/timings/timings3.c example_timings_p8est_bricks_SOURCES = example/timings/bricks3.c example_timings_p8est_loadconn_SOURCES = example/timings/loadconn3.c example_timings_p8est_tsearch_SOURCES = example/timings/tsearch3.c - -LINT_CSOURCES += \ - $(example_timings_p8est_timings_SOURCES) \ - $(example_timings_p8est_bricks_SOURCES) \ - $(example_timings_p8est_loadconn_SOURCES) \ - $(example_timings_p8est_tsearch_SOURCES) endif EXTRA_DIST += example/timings/timana.awk example/timings/timana.sh From 183217772adf5d5a5d28fabdddbb08fd8ed3aef1 Mon Sep 17 00:00:00 2001 From: Carsten Burstedde Date: Tue, 19 Dec 2023 18:05:45 +0100 Subject: [PATCH 2/3] Remove obsolete code related to lint --- Makefile.am | 22 ------------ configure.ac | 2 -- example/points/Makefile.am | 2 -- src/Makefile.am | 2 -- src/p4est_base.c | 4 --- test/Makefile.am | 73 -------------------------------------- 6 files changed, 105 deletions(-) diff --git a/Makefile.am b/Makefile.am index ef9a0bb3e..8e43a7c82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ CLEANFILES = DISTCLEANFILES = EXTRA_DIST = LDADD = -LINT_CSOURCES = TESTS = bin_PROGRAMS = check_PROGRAMS = @@ -78,27 +77,6 @@ include example/timings/Makefile.am include example/balance/Makefile.am include example/search/Makefile.am -## This was only used for our lint code, which needs to be replaced. -## -## # lint static syntax checker -## ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -## $(MPI_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \ -## $(src_libp4est_a_CPPFLAGS) -## lint: -## if LINT -## @for subdir in $(SUBDIRS) ; do \ -## echo "Making $@ in $$subdir"; \ -## (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \ -## done -## for f in $(LINT_CSOURCES) ; do \ -## $(LINT) $(ALL_LINT_FLAGS) $(top_srcdir)/$$f || \ -## echo "Lint check failed for $$f" ; \ -## done -## else -## @echo "Static source code check disabled by configure" -## endif -## .PHONY: lint - # revision control and ChangeLog ChangeLog: (GIT_DIR=@top_srcdir@/.git git log > .ChangeLog.tmp && \ diff --git a/configure.ac b/configure.ac index 873bca564..64c6b35e6 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,6 @@ SC_MPI_CONFIG([P4EST], [], []) SC_MPI_ENGAGE([P4EST]) # This is needed for compatibility with automake >= 1.12 m4_ifdef([AM_PROG_AR],[AM_PROG_AR]) -dnl SC_PROG_LINT -dnl SC_C_VERSION LT_INIT echo "o---------------------------------------" diff --git a/example/points/Makefile.am b/example/points/Makefile.am index b0139ecae..12f186325 100644 --- a/example/points/Makefile.am +++ b/example/points/Makefile.am @@ -9,7 +9,6 @@ example_points_p4est_points_SOURCES = example/points/points2.c bin_PROGRAMS += example/points/p4est_points_generate example_points_p4est_points_generate_SOURCES = example/points/generate_points2.c - endif if P4EST_ENABLE_BUILD_3D @@ -18,5 +17,4 @@ example_points_p8est_points_SOURCES = example/points/points3.c bin_PROGRAMS += example/points/p8est_points_generate example_points_p8est_points_generate_SOURCES = example/points/generate_points3.c - endif diff --git a/src/Makefile.am b/src/Makefile.am index 0acd5ce03..dcf6dfde4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,5 +94,3 @@ nodist_include_HEADERS += $(libp4est_generated_headers) include_HEADERS += $(libp4est_installed_headers) AM_CPPFLAGS += -I@top_srcdir@/src @P4EST_SC_CPPFLAGS@ - -LINT_CSOURCES += $(libp4est_compiled_sources) diff --git a/src/p4est_base.c b/src/p4est_base.c index f6f62a3b5..15f244c33 100644 --- a/src/p4est_base.c +++ b/src/p4est_base.c @@ -93,8 +93,6 @@ p4est_get_package_id (void) #undef P4EST_LERRORF #endif -#ifndef SC_SPLINT - void P4EST_GLOBAL_LOGF (int priority, const char *fmt, ...) { @@ -165,5 +163,3 @@ p4est_version_minor (void) /* In rare cases SC_VERSION_MAJOR may be a non-numerical string */ return sc_atoi (SC_TOSTRING (P4EST_VERSION_MINOR)); } - -#endif diff --git a/test/Makefile.am b/test/Makefile.am index b442497c9..985c60d77 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -166,76 +166,3 @@ endif endif TESTS += $(p4est_test_programs) - -LINT_CSOURCES += \ - $(test_p4est_test_comm_SOURCES) \ - $(test_p4est_test_hash_SOURCES) \ - $(test_p4est_test_quadrants_SOURCES) \ - $(test_p4est_test_balance_SOURCES) \ - $(test_p4est_test_partition_SOURCES) \ - $(test_p4est_test_order_SOURCES) \ - $(test_p4est_test_coarsen_SOURCES) \ - $(test_p4est_test_valid_SOURCES) \ - $(test_p4est_test_balance_type_SOURCES) \ - $(test_p4est_test_loadsave_SOURCES) \ - $(test_p4est_test_load_SOURCES) \ - $(test_p4est_test_ghost_SOURCES) \ - $(test_p4est_test_mesh_bijective_SOURCES) \ - $(test_p4est_test_conn_transformation_SOURCES) \ - $(test_p4est_test_iterate_SOURCES) \ - $(test_p4est_test_lnodes_SOURCES) \ - $(test_p4est_test_search_SOURCES) \ - $(test_p4est_test_complete_subtree_SOURCES) \ - $(test_p4est_test_brick_SOURCES) \ - $(test_p4est_test_partition_corr_SOURCES) \ - $(test_p4est_test_reorder_SOURCES) \ - $(test_p4est_test_balance_seeds_SOURCES) \ - $(test_p4est_test_wrap_SOURCES) \ - $(test_p4est_test_replace_SOURCES) \ - $(test_p4est_test_join_SOURCES) \ - $(test_p4est_test_conn_reduce_SOURCES) \ - $(test_p4est_test_plex_SOURCES) \ - $(test_p4est_test_connrefine_SOURCES) \ - $(test_p4est_test_subcomm_SOURCES) \ - $(test_p4est_test_nodes_SOURCES) \ - $(test_p4est_test_version_SOURCES) \ - $(test_p4est_test_io_SOURCES) \ - $(test_p8est_test_quadrants_SOURCES) \ - $(test_p8est_test_balance_SOURCES) \ - $(test_p8est_test_partition_SOURCES) \ - $(test_p8est_test_coarsen_SOURCES) \ - $(test_p8est_test_valid_SOURCES) \ - $(test_p8est_test_balance_type_SOURCES) \ - $(test_p8est_test_face_transform_SOURCES) \ - $(test_p8est_test_edge_face_corners_SOURCES) \ - $(test_p8est_test_periodic_SOURCES) \ - $(test_p8est_test_loadsave_SOURCES) \ - $(test_p8est_test_load_SOURCES) \ - $(test_p8est_test_ghost_SOURCES) \ - $(test_p8est_test_corners_SOURCES) \ - $(test_p8est_test_mesh_bijective_SOURCES) \ - $(test_p8est_test_conn_transformation_SOURCES) \ - $(test_p8est_test_brick_SOURCES) \ - $(test_p8est_test_iterate_SOURCES) \ - $(test_p8est_test_lnodes_SOURCES) \ - $(test_p8est_test_search_SOURCES) \ - $(test_p8est_test_reorder_SOURCES) \ - $(test_p8est_test_partition_corr_SOURCES) \ - $(test_p8est_test_balance_seeds_SOURCES) \ - $(test_p8est_test_wrap_SOURCES) \ - $(test_p8est_test_replace_SOURCES) \ - $(test_p8est_test_join_SOURCES) \ - $(test_p8est_test_conn_reduce_SOURCES) \ - $(test_p8est_test_plex_SOURCES) \ - $(test_p8est_test_connrefine_SOURCES) \ - $(test_p8est_test_subcomm_SOURCES) \ - $(test_p8est_test_nodes_SOURCES) \ - $(test_p8est_test_version_SOURCES) \ - $(test_p8est_test_io_SOURCES) \ - $(test_p6est_test_all_SOURCES) - -if P4EST_WITH_METIS -LINT_CSOURCES += \ - $(test_p4est_test_reorder_SOURCES) \ - $(test_p8est_test_reorder_SOURCES) -endif From 21b8539401c164e95d81c524b0bb967219c95c29 Mon Sep 17 00:00:00 2001 From: Carsten Burstedde Date: Tue, 19 Dec 2023 18:06:34 +0100 Subject: [PATCH 3/3] Update libsc to latest develop branch --- .github/workflows/ci.yml | 2 +- sc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd6f4de36..3e9b47104 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,7 +139,7 @@ jobs: cd sc git fetch --tags # git checkout v2.8.5 - git checkout -b test-branch a8a9995240eb51c11dfbadead4473d30eed79883 + git checkout -b test-branch 3a6f67bb5f614e68bbc9852c2ef1cc1a9d96ea83 - name: Run bootstrap script run: ./bootstrap diff --git a/sc b/sc index a8a999524..3a6f67bb5 160000 --- a/sc +++ b/sc @@ -1 +1 @@ -Subproject commit a8a9995240eb51c11dfbadead4473d30eed79883 +Subproject commit 3a6f67bb5f614e68bbc9852c2ef1cc1a9d96ea83