Skip to content

Commit 7d0b968

Browse files
brobeybrobey
committed
Removing REPRO_BLAS options
1 parent 9e8f503 commit 7d0b968

6 files changed

+3
-180
lines changed

‎CMakeLists.txt

-40
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,6 @@ endif (OPENGL_FOUND)
187187
# endif (EXISTS "$ENV{QUO_HOME}/include/")
188188
#endif (DEFINED ENV{QUO_HOME})
189189

190-
#if(DEFINED ENV{REPROBLAS_HOME})
191-
# if(EXISTS "$ENV{REPROBLAS_HOME}/include/rblas.h")
192-
# message(STATUS "reproBlas Detected")
193-
# set (REPROBLAS_FOUND on)
194-
# set (HAVE_REPROBLAS ON)
195-
# include_directories($ENV{REPROBLAS_HOME}/include)
196-
# set (REPROBLAS_LIBRARIES -L$ENV{REPROBLAS_HOME}/libs -lreproblas_mpi -lreproblas_seq -liblas -lmpindexedfp -lindexedfp)
197-
# endif (EXISTS "$ENV{REPROBLAS_HOME}/include/rblas.h")
198-
#endif (DEFINED ENV{REPROBLAS_HOME})
199-
200190
#if(DEFINED ENV{LTTRACE_HOME})
201191
# if(EXISTS "$ENV{LTTRACE_HOME}/lib/liblttrace.a")
202192
# message(STATUS "LTTRACE Detected")
@@ -318,9 +308,6 @@ if (OPENCL_FOUND AND MPI_FOUND)
318308
set_target_properties(clamr PROPERTIES COMPILE_DEFINITIONS "HAVE_MPI;HAVE_OPENCL")
319309
target_link_libraries(clamr dpmesh hsfc kdtree zorder crux dhash pezcl pgraphics timer memstats dl7 genmalloc dpMallocPlus m)
320310
target_link_libraries(clamr ${OPENCL_LIBRARIES})
321-
if (REPROBLAS_FOUND)
322-
target_link_libraries(clamr ${REPROBLAS_LIBRARIES})
323-
endif (REPROBLAS_FOUND)
324311
if (LTTRACE_FOUND)
325312
target_link_libraries(clamr ${LTTRACE_LIBRARIES})
326313
endif (LTTRACE_FOUND)
@@ -343,9 +330,6 @@ set(clamr_cpuonly_SRCS ${clamr_cpuonly_CXX_SRCS} ${clamr_cpuonly_C_SRCS} ${clamr
343330
add_executable(clamr_cpuonly ${clamr_cpuonly_SRCS})
344331

345332
target_link_libraries(clamr_cpuonly PowerParser mesh hsfc kdtree zorder crux hash graphics timer memstats genmalloc MallocPlus m)
346-
if (REPROBLAS_FOUND)
347-
target_link_libraries(clamr_cpuonly ${REPROBLAS_LIBRARIES})
348-
endif (REPROBLAS_FOUND)
349333
#target_link_libraries(clamr_cpuonly ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
350334

351335
install(TARGETS clamr_cpuonly DESTINATION bin)
@@ -362,9 +346,6 @@ if (OPENCL_FOUND)
362346

363347
target_link_libraries(clamr_gpuonly PowerParser dmesh hsfc kdtree zorder crux dhash ezcl graphics timer memstats genmalloc dMallocPlus m)
364348
target_link_libraries(clamr_gpuonly ${OPENCL_LIBRARIES})
365-
if (REPROBLAS_FOUND)
366-
target_link_libraries(clamr_gpuonly ${REPROBLAS_LIBRARIES})
367-
endif (REPROBLAS_FOUND)
368349
if (MIC_NATIVE)
369350
target_link_libraries(clamr_gpuonly iomp5 cilkrts)
370351
endif (MIC_NATIVE)
@@ -384,9 +365,6 @@ if (MPI_FOUND)
384365

385366
set_target_properties(clamr_mpionly PROPERTIES COMPILE_DEFINITIONS HAVE_MPI)
386367
target_link_libraries(clamr_mpionly pPowerParser pmesh hsfc kdtree zorder crux hash pgraphics timer memstats l7 genmalloc pMallocPlus m)
387-
if (REPROBLAS_FOUND)
388-
target_link_libraries(clamr_mpionly ${REPROBLAS_LIBRARIES})
389-
endif (REPROBLAS_FOUND)
390368
if (LTTRACE_FOUND)
391369
target_link_libraries(clamr_mpionly ${LTTRACE_LIBRARIES})
392370
endif (LTTRACE_FOUND)
@@ -413,9 +391,6 @@ if(OPENMP_FOUND)
413391
set_target_properties(clamr_openmponly PROPERTIES LINK_FLAGS "${OpenMP_C_FLAGS}")
414392

415393
target_link_libraries(clamr_openmponly PowerParser mpmesh hsfc kdtree zorder crux mphash graphics timer memstats genmalloc mpMallocPlus m)
416-
if (REPROBLAS_FOUND)
417-
target_link_libraries(clamr_openmponly ${REPROBLAS_LIBRARIES})
418-
endif (REPROBLAS_FOUND)
419394
if (MIC_NATIVE)
420395
target_link_libraries(clamr_openmponly iomp5 cilkrts)
421396
endif (MIC_NATIVE)
@@ -441,9 +416,6 @@ if (MPI_FOUND AND OPENMP_FOUND)
441416
set_target_properties(clamr_mpiopenmponly PROPERTIES LINK_FLAGS "${clamr_mpiopenmponly_link_flags}")
442417

443418
target_link_libraries(clamr_mpiopenmponly pPowerParser pmpmesh hsfc kdtree zorder crux mphash pgraphics timer memstats mpl7 genmalloc pmpMallocPlus m)
444-
if (REPROBLAS_FOUND)
445-
target_link_libraries(clamr_mpiopenmponly ${REPROBLAS_LIBRARIES})
446-
endif (REPROBLAS_FOUND)
447419
if (LTTRACE_FOUND)
448420
target_link_libraries(clamr_mpiopenmponly ${LTTRACE_LIBRARIES})
449421
endif (LTTRACE_FOUND)
@@ -488,9 +460,6 @@ if (QUO_FOUND AND MPI_FOUND AND OPENMP_FOUND AND Boost_FOUND)
488460
target_link_libraries(clamr_quo pmesh hsfc kdtree zorder crux hash pgraphics timer memstats l7 genmalloc pMallocPlus m)
489461
target_link_libraries(clamr_quo quo)
490462
target_link_libraries(clamr_quo j7)
491-
if (REPROBLAS_FOUND)
492-
target_link_libraries(clamr_quo ${REPROBLAS_LIBRARIES})
493-
endif (REPROBLAS_FOUND)
494463
if (LTTRACE_FOUND)
495464
target_link_libraries(clamr_quo ${LTTRACE_LIBRARIES})
496465
endif (LTTRACE_FOUND)
@@ -525,9 +494,6 @@ if (OPENCL_FOUND)
525494

526495
target_link_libraries(clamr_gpucheck PowerParser dmesh hsfc kdtree zorder crux dhash ezcl graphics timer memstats genmalloc dMallocPlus m)
527496
target_link_libraries(clamr_gpucheck ${OPENCL_LIBRARIES})
528-
if (REPROBLAS_FOUND)
529-
target_link_libraries(clamr_gpucheck ${REPROBLAS_LIBRARIES})
530-
endif (REPROBLAS_FOUND)
531497
if (MIC_NATIVE)
532498
target_link_libraries(clamr_gpucheck iomp5 cilkrts)
533499
endif (MIC_NATIVE)
@@ -547,9 +513,6 @@ if (MPI_FOUND)
547513

548514
set_target_properties(clamr_mpicheck PROPERTIES COMPILE_DEFINITIONS HAVE_MPI)
549515
target_link_libraries(clamr_mpicheck pmesh hsfc kdtree zorder crux hash pgraphics timer memstats l7 genmalloc pMallocPlus m)
550-
if (REPROBLAS_FOUND)
551-
target_link_libraries(clamr_mpicheck ${REPROBLAS_LIBRARIES})
552-
endif (REPROBLAS_FOUND)
553516
if (LTTRACE_FOUND)
554517
target_link_libraries(clamr_mpicheck ${LTTRACE_LIBRARIES})
555518
endif (LTTRACE_FOUND)
@@ -573,9 +536,6 @@ if (MPI_FOUND AND OPENCL_FOUND)
573536
set_target_properties(clamr_checkall PROPERTIES COMPILE_DEFINITIONS "HAVE_MPI;HAVE_OPENCL")
574537
target_link_libraries(clamr_checkall dpmesh hsfc kdtree zorder crux dhash pezcl pgraphics timer memstats dl7 genmalloc dpMallocPlus m)
575538
target_link_libraries(clamr_checkall ${OPENCL_LIBRARIES})
576-
if (REPROBLAS_FOUND)
577-
target_link_libraries(clamr_checkall ${REPROBLAS_LIBRARIES})
578-
endif (REPROBLAS_FOUND)
579539
if (LTTRACE_FOUND)
580540
target_link_libraries(clamr_checkall ${LTTRACE_LIBRARIES})
581541
endif (LTTRACE_FOUND)

‎config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@
5252

5353
/* Define if you have LTTRACE support */
5454
#cmakedefine HAVE_LTTRACE
55-
56-
/* Define if you have reproBLAS support */
57-
#cmakedefine HAVE_REPROBLAS

‎experimental_iterative_state.cpp

+1-65
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@
6666
#include <mpi.h>
6767
#endif
6868

69-
#ifdef HAVE_REPROBLAS
70-
#ifdef __cplusplus
71-
extern "C"
72-
{
73-
#endif
74-
#ifdef HAVE_MPI
75-
#ifdef OMPI_MPI_H
76-
#define OMPI_SKIP_MPICXX
77-
#endif
78-
#include <MPIndexedFP.h>
79-
#else
80-
#include <IndexedFP.h>
81-
#endif
82-
#ifdef __cplusplus
83-
}
84-
#endif
85-
#endif
86-
8769
#undef DEBUG
8870
//#define DEBUG 1
8971
#undef DEBUG_RESTORE_VALS
@@ -197,9 +179,6 @@ State::State(Mesh *mesh_in)
197179
// FIXME add fini and set size
198180
if (mesh->parallel) state_memory.pinit(MPI_COMM_WORLD, 2L * 1024 * 1024 * 1024);
199181
}
200-
#ifdef HAVE_REPROBLAS
201-
RMPI_Init(); // Initialize Reproducible MPI
202-
#endif
203182
#endif
204183
}
205184

@@ -2173,50 +2152,7 @@ double State::mass_sum(int enhanced_precision_sum)
21732152
#else
21742153
total_sum = local.sum + local.correction;
21752154
#endif
2176-
#ifdef HAVE_REPROBLAS
2177-
} else if (enhanced_precision_sum == SUM_REPROBLAS_DOUBLE_DOUBLE){
2178-
int fold = 2;
2179-
double ss[4] = {0.0, 0.0, 0.0, 0.0};
2180-
for (uint ic=0; ic < ncells; ic++){
2181-
if (celltype[ic] == REAL_CELL) {
2182-
dndpd(fold, ss, H[ic]*mesh->lev_deltax[level[ic]]*mesh->lev_deltay[level[ic]]);
2183-
}
2184-
}
2185-
total_sum = ss[0] + ss[1];
2186-
#ifdef HAVE_MPI
2187-
if (mesh->parallel) {
2188-
struct esum_type local, global;
2189-
local.sum = ss[0];
2190-
local.correction = ss[1];
2191-
MPI_Allreduce(&local, &global, 1, MPI_TWO_DOUBLES, KAHAN_SUM, MPI_COMM_WORLD);
2192-
total_sum = global.sum + global.correction;
2193-
} else {
2194-
total_sum = ss[0] + ss[1];
2195-
}
2196-
#else
2197-
total_sum = ss[0] + ss[1];
2198-
#endif
2199-
} else if (enhanced_precision_sum == SUM_REPROBLAS_INDEXEDFP) {
2200-
//printf("DEBUG -- reproblas_indexedfp_sum\n");
2201-
Idouble IFPsummer, IFPtotal_sum;
2202-
dISetZero(IFPsummer);
2203-
for (uint ic=0; ic < ncells; ic++){
2204-
if (celltype[ic] == REAL_CELL) {
2205-
dIAddd(&IFPsummer, H[ic]*mesh->lev_deltax[level[ic]]*mesh->lev_deltay[level[ic]]);
2206-
}
2207-
}
2208-
#ifdef HAVE_MPI
2209-
if (mesh->parallel) {
2210-
MPI_Allreduce(&IFPsummer, &IFPtotal_sum, 1, MPI_IDOUBLE, MPI_RSUM, MPI_COMM_WORLD);
2211-
} else {
2212-
IFPtotal_sum = IFPsummer;
2213-
}
2214-
#else
2215-
IFPtotal_sum = IFPsummer;
2216-
#endif
2217-
2218-
total_sum = Iconv2d(IFPtotal_sum);
2219-
#endif
2155+
22202156
} else if (enhanced_precision_sum == SUM_REGULAR) {
22212157
//printf("DEBUG -- regular_sum\n");
22222158
for (uint ic=0; ic < ncells; ic++){

‎input.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,6 @@ void parseInput(const int argc, char** argv)
438438
enhanced_precision_sum = SUM_REGULAR;
439439
} else if (! strcmp(val,"kahan_sum") ) {
440440
enhanced_precision_sum = SUM_KAHAN;
441-
} else if (! strcmp(val,"reproblas_doubledouble_sum") ) {
442-
enhanced_precision_sum = SUM_REPROBLAS_DOUBLE_DOUBLE;
443-
} else if (! strcmp(val,"reproblas_indexedfp_sum") ) {
444-
enhanced_precision_sum = SUM_REPROBLAS_INDEXEDFP;
445441
} else {
446442
printf("Error with sum argument %s\n",val);
447443
exit(0);

‎state.cpp

+1-65
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,6 @@
6565
#include <mpi.h>
6666
#endif
6767

68-
#ifdef HAVE_REPROBLAS
69-
#ifdef __cplusplus
70-
extern "C"
71-
{
72-
#endif
73-
#ifdef HAVE_MPI
74-
#ifdef OMPI_MPI_H
75-
#define OMPI_SKIP_MPICXX
76-
#endif
77-
#include <MPIndexedFP.h>
78-
#else
79-
#include <IndexedFP.h>
80-
#endif
81-
#ifdef __cplusplus
82-
}
83-
#endif
84-
#endif
85-
8668
#undef DEBUG
8769
//#define DEBUG 0
8870
#undef DEBUG_RESTORE_VALS
@@ -254,9 +236,6 @@ State::State(Mesh *mesh_in)
254236
// FIXME add fini and set size
255237
if (mesh->parallel) state_memory.pinit(MPI_COMM_WORLD, 2L * 1024 * 1024 * 1024);
256238
}
257-
#ifdef HAVE_REPROBLAS
258-
RMPI_Init(); // Initialize Reproducible MPI
259-
#endif
260239
#endif
261240
}
262241

@@ -3005,50 +2984,7 @@ double State::mass_sum(int enhanced_precision_sum)
30052984
#else
30062985
total_sum = local.sum + local.correction;
30072986
#endif
3008-
#ifdef HAVE_REPROBLAS
3009-
} else if (enhanced_precision_sum == SUM_REPROBLAS_DOUBLE_DOUBLE){
3010-
int fold = 2;
3011-
double ss[4] = {0.0, 0.0, 0.0, 0.0};
3012-
for (uint ic=0; ic < ncells; ic++){
3013-
if (celltype[ic] == REAL_CELL) {
3014-
dndpd(fold, ss, H[ic]*mesh->lev_deltax[level[ic]]*mesh->lev_deltay[level[ic]]);
3015-
}
3016-
}
3017-
total_sum = ss[0] + ss[1];
3018-
#ifdef HAVE_MPI
3019-
if (mesh->parallel) {
3020-
struct esum_type local, global;
3021-
local.sum = ss[0];
3022-
local.correction = ss[1];
3023-
MPI_Allreduce(&local, &global, 1, MPI_TWO_DOUBLES, KAHAN_SUM, MPI_COMM_WORLD);
3024-
total_sum = global.sum + global.correction;
3025-
} else {
3026-
total_sum = ss[0] + ss[1];
3027-
}
3028-
#else
3029-
total_sum = ss[0] + ss[1];
3030-
#endif
3031-
} else if (enhanced_precision_sum == SUM_REPROBLAS_INDEXEDFP) {
3032-
//printf("DEBUG -- reproblas_indexedfp_sum\n");
3033-
Idouble IFPsummer, IFPtotal_sum;
3034-
dISetZero(IFPsummer);
3035-
for (uint ic=0; ic < ncells; ic++){
3036-
if (celltype[ic] == REAL_CELL) {
3037-
dIAddd(&IFPsummer, H[ic]*mesh->lev_deltax[level[ic]]*mesh->lev_deltay[level[ic]]);
3038-
}
3039-
}
3040-
#ifdef HAVE_MPI
3041-
if (mesh->parallel) {
3042-
MPI_Allreduce(&IFPsummer, &IFPtotal_sum, 1, MPI_IDOUBLE, MPI_RSUM, MPI_COMM_WORLD);
3043-
} else {
3044-
IFPtotal_sum = IFPsummer;
3045-
}
3046-
#else
3047-
IFPtotal_sum = IFPsummer;
3048-
#endif
3049-
3050-
total_sum = Iconv2d(IFPtotal_sum);
3051-
#endif
2987+
30522988
} else if (enhanced_precision_sum == SUM_REGULAR) {
30532989
//printf("DEBUG -- regular_sum\n");
30542990
for (uint ic=0; ic < ncells; ic++){

‎state.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@ extern "C" void do_calc(void);
152152

153153
enum SUM_TYPE {
154154
SUM_REGULAR,
155-
SUM_KAHAN,
156-
SUM_REPROBLAS_DOUBLE_DOUBLE,
157-
SUM_REPROBLAS_INDEXEDFP,
155+
SUM_KAHAN
158156
};
159157

160158

0 commit comments

Comments
 (0)