Index: ga/Makefile.am =================================================================== --- ga.orig/Makefile.am 2025-03-20 00:48:46.615613348 +0100 +++ ga/Makefile.am 2025-03-20 00:48:46.603613328 +0100 @@ -469,7 +469,7 @@ check_PROGRAMS += global/testing/scan_copyc check_PROGRAMS += global/testing/sprsmatvec check_PROGRAMS += global/testing/testabstract_ops -check_PROGRAMS += global/testing/testsparse +#check_PROGRAMS += global/testing/testsparse check_PROGRAMS += global/testing/laplace check_PROGRAMS += global/testing/sprs_test check_PROGRAMS += global/testing/kaczmarz @@ -480,9 +480,11 @@ check_PROGRAMS += global/testing/testmult check_PROGRAMS += global/testing/testmultrect check_PROGRAMS += global/testing/gemmtest +if DEBIAN_ADD_EXTRA_TESTS check_PROGRAMS += global/testing/thread_perf_contig check_PROGRAMS += global/testing/thread_perf_strided check_PROGRAMS += global/testing/threadsafec +endif check_PROGRAMS += global/testing/read_only check_PROGRAMS += global/testing/cache_test check_PROGRAMS += global/testing/unpackc @@ -495,8 +497,10 @@ check_PROGRAMS += global/testing/ga_lu check_PROGRAMS += global/testing/ga_shift check_PROGRAMS += global/testing/ghosts +if DEBIAN_ADD_EXTRA_TESTS check_PROGRAMS += global/testing/jacobi -check_PROGRAMS += global/testing/mir_perf2 +endif +#check_PROGRAMS += global/testing/mir_perf2 check_PROGRAMS += global/testing/mmatrix check_PROGRAMS += global/testing/mulmatpatch check_PROGRAMS += global/testing/nbtest @@ -505,9 +509,9 @@ check_PROGRAMS += global/testing/patch check_PROGRAMS += global/testing/patch2 check_PROGRAMS += global/testing/patch_enumf -check_PROGRAMS += global/testing/perfmod -check_PROGRAMS += global/testing/perform -check_PROGRAMS += global/testing/perf +#check_PROGRAMS += global/testing/perfmod +#check_PROGRAMS += global/testing/perform +#check_PROGRAMS += global/testing/perf check_PROGRAMS += global/testing/pg2testmatmult check_PROGRAMS += global/testing/pg2test check_PROGRAMS += global/testing/pgtestmatmult @@ -516,8 +520,8 @@ check_PROGRAMS += global/testing/scan check_PROGRAMS += global/testing/simple_groups check_PROGRAMS += global/testing/sparse -check_PROGRAMS += global/testing/sprsmatmult -check_PROGRAMS += global/testing/stride +#check_PROGRAMS += global/testing/sprsmatmult +#check_PROGRAMS += global/testing/stride check_PROGRAMS += global/testing/testeig check_PROGRAMS += global/testing/testmatmult check_PROGRAMS += global/testing/testsolve @@ -676,9 +680,11 @@ GLOBAL_PARALLEL_TESTS += global/testing/testmult$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/testmultrect$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/gemmtest$(EXEEXT) +if DEBIAN_ADD_EXTRA_TESTS GLOBAL_THREADED_TESTS += global/testing/thread_perf_contig$(EXEEXT) GLOBAL_THREADED_TESTS += global/testing/thread_perf_strided$(EXEEXT) GLOBAL_THREADED_TESTS += global/testing/threadsafec$(EXEEXT) +endif GLOBAL_PARALLEL_TESTS += global/testing/read_only$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/cache_test$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/unpackc$(EXEEXT) @@ -691,8 +697,10 @@ GLOBAL_PARALLEL_TESTS += global/testing/ga_lu$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/ga_shift$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/ghosts$(EXEEXT) +if DEBIAN_ADD_EXTRA_TESTS GLOBAL_PARALLEL_TESTS += global/testing/jacobi$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/mir_perf2$(EXEEXT) +endif +#GLOBAL_PARALLEL_TESTS += global/testing/mir_perf2$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/mmatrix$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/mulmatpatch$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/nbtest$(EXEEXT) @@ -701,9 +709,9 @@ GLOBAL_PARALLEL_TESTS += global/testing/patch$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/patch2$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/patch_enumf$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/perfmod$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/perform$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/perf$(EXEEXT) +#GLOBAL_PARALLEL_TESTS += global/testing/perfmod$(EXEEXT) +#GLOBAL_PARALLEL_TESTS += global/testing/perform$(EXEEXT) +#GLOBAL_PARALLEL_TESTS += global/testing/perf$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/perf2$(EXEEXT) #GLOBAL_PARALLEL_TESTS += global/testing/pg2testmatmult$(EXEEXT) # needs 8 procs exactly GLOBAL_PARALLEL_TESTS += global/testing/pg2test$(EXEEXT) @@ -713,8 +721,8 @@ GLOBAL_PARALLEL_TESTS += global/testing/scan$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/simple_groups$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/sparse$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/sprsmatmult$(EXEEXT) -GLOBAL_PARALLEL_TESTS += global/testing/stride$(EXEEXT) +#GLOBAL_PARALLEL_TESTS += global/testing/sprsmatmult$(EXEEXT) +#GLOBAL_PARALLEL_TESTS += global/testing/stride$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/testeig$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/testmatmult$(EXEEXT) GLOBAL_PARALLEL_TESTS += global/testing/testsolve$(EXEEXT) @@ -915,9 +923,11 @@ global_testing_getmem_SOURCES = global/testing/getmem.c global_testing_ghosts_SOURCES = global/testing/ghosts.F $(gtsrcf) global_testing_ipc_clean_SOURCES = global/testing/ipc.clean.c +if DEBIAN_ADD_EXTRA_TESTS global_testing_jacobi_SOURCES = global/testing/jacobi.F $(gtsrcf) +endif global_testing_lock_SOURCES = global/testing/lock.c -global_testing_mir_perf2_SOURCES = global/testing/mir_perf2.F $(gtsrcf) +#global_testing_mir_perf2_SOURCES = global/testing/mir_perf2.F $(gtsrcf) global_testing_mmatrix_SOURCES = global/testing/mmatrix.F $(gtsrcf) global_testing_mtest_SOURCES = global/testing/mtest.c global_testing_mulmatpatch_SOURCES = global/testing/mulmatpatch.F $(gtsrcf) $(testblassrc) @@ -935,10 +945,10 @@ global_testing_patch2_SOURCES = global/testing/patch2.F $(gtsrcf) global_testing_patch_enumc_SOURCES = global/testing/patch_enumc.c global_testing_patch_enumf_SOURCES = global/testing/patch_enumf.F $(gtsrcf) -global_testing_perf_SOURCES = global/testing/perf.F $(gtsrcf) +#global_testing_perf_SOURCES = global/testing/perf.F $(gtsrcf) global_testing_perf2_SOURCES = global/testing/perf2.c -global_testing_perfmod_SOURCES = global/testing/perfmod.F $(gtsrcf) -global_testing_perform_SOURCES = global/testing/perform.F $(gtsrcf) +#global_testing_perfmod_SOURCES = global/testing/perfmod.F $(gtsrcf) +#global_testing_perform_SOURCES = global/testing/perform.F $(gtsrcf) global_testing_pg2test_SOURCES = global/testing/pg2test.F $(gtsrcf) global_testing_pg2testmatmult_SOURCES = global/testing/pg2testmatmult.F $(gtsrcf) $(testblassrc) global_testing_pgtest_SOURCES = global/testing/pgtest.F $(gtsrcf) @@ -950,7 +960,7 @@ global_testing_scan_addc_SOURCES = global/testing/scan_addc.c global_testing_scan_copyc_SOURCES = global/testing/scan_copyc.c global_testing_sprsmatvec_SOURCES = global/testing/sprsmatvec.c -global_testing_testsparse_SOURCES = global/testing/testsparse.c +#global_testing_testsparse_SOURCES = global/testing/testsparse.c global_testing_laplace_SOURCES = global/testing/laplace.c global_testing_sprs_test_SOURCES = global/testing/sprs_test.c global_testing_kaczmarz_SOURCES = global/testing/kaczmarz.c @@ -960,8 +970,8 @@ global_testing_simple_groups_comm_SOURCES = global/testing/simple_groups_comm.F $(gtsrcf) global_testing_simple_groups_commc_SOURCES = global/testing/simple_groups_commc.c global_testing_sparse_SOURCES = global/testing/sparse.F $(gtsrcf) -global_testing_sprsmatmult_SOURCES = global/testing/sprsmatmult.F $(gtsrcf) -global_testing_stride_SOURCES = global/testing/stride.F $(gtsrcf) +#global_testing_sprsmatmult_SOURCES = global/testing/sprsmatmult.F $(gtsrcf) +#global_testing_stride_SOURCES = global/testing/stride.F $(gtsrcf) global_testing_testabstract_ops_SOURCES = global/testing/testabstract_ops.c global_testing_test_SOURCES = global/testing/test.F $(gtsrcf) global_testing_test_mirrored_SOURCES = global/testing/test.F $(gtsrcf) @@ -975,9 +985,11 @@ global_testing_gemmtest_SOURCES = global/testing/gemmtest.c global_testing_testsolve_SOURCES = global/testing/testsolve.F $(gtsrcf) global_testing_testspd_SOURCES = global/testing/testspd.F $(gtsrcf) +if DEBIAN_ADD_EXTRA_TESTS global_testing_thread_perf_contig_SOURCES = global/testing/thread_perf_contig.c global_testing_thread_perf_strided_SOURCES = global/testing/thread_perf_strided.c global_testing_threadsafec_SOURCES = global/testing/threadsafec.c +endif global_testing_types_test_SOURCES = global/testing/types-test.F $(gtsrcf) global_testing_unpackc_SOURCES = global/testing/unpackc.c global_testing_cache_test_SOURCES = global/testing/cache_test.c @@ -1104,7 +1116,9 @@ ############################################################################## # global/examples # +if DEBIAN_ADD_EXTRA_TESTS check_PROGRAMS += global/examples/lennard-jones/lennard +endif if ENABLE_F77 check_PROGRAMS += global/examples/boltzmann/boltz check_PROGRAMS += global/examples/conjugate_gradient/ga_cg @@ -1112,7 +1126,9 @@ check_PROGRAMS += global/examples/scf/scf endif +if DEBIAN_ADD_EXTRA_TESTS GLOBAL_PARALLEL_TESTS += global/examples/lennard-jones/lennard$(EXEEXT) +endif if ENABLE_F77 GLOBAL_PARALLEL_TESTS += global/examples/boltzmann/boltz$(EXEEXT) #GLOBAL_PARALLEL_TESTS += global/examples/conjugate_gradient/ga_cg$(EXEEXT) # needs input @@ -1142,9 +1158,10 @@ global/examples/conjugate_gradient/read_input.c global_examples_conjugate_gradient_ga_cg_LDFLAGS = $(AM_LDFLAGS) $(FLD_NOMAIN) +if DEBIAN_ADD_EXTRA_TESTS global_examples_lennard_jones_lennard_SOURCES = \ global/examples/lennard-jones/lennard.c - +endif global_examples_md_cluster_grp_sim_SOURCES = \ global/examples/md_cluster/cell_list.F \ global/examples/md_cluster/cl_sim.F \ Index: ga/configure.ac =================================================================== --- ga.orig/configure.ac 2025-03-20 00:48:46.615613348 +0100 +++ ga/configure.ac 2025-03-20 00:48:46.607613334 +0100 @@ -51,6 +51,10 @@ # Don't emit "rebuild rules" for configure, Makefile.ins, etc. AM_MAINTAINER_MODE +# need to skip some tests on some architectures +# e.g. skip jacobi on mips64el. ie. add if not mips64el. +AM_CONDITIONAL([DEBIAN_ADD_EXTRA_TESTS], [test "x`dpkg-architecture -qDEB_HOST_ARCH`" != xmips64el]) + ############################################################################### # Misc. information and package setup. ###############################################################################