[dcmf] [PATCH 1/1] Fix DCMF_Network enum to follow standard DCMF
convention.
Michael Blocksome
blocksom at us.ibm.com
Mon Nov 24 16:02:02 CST 2008
Signed-off-by: Michael Blocksome <blocksom at us.ibm.com>
---
lib/ga/Makefile | 87 ++++++++++---------
sys/include/dcmf.h | 10 +-
.../prod/get/cdi/getoversend/GetOverSend.cc | 4 +-
.../prod/put/cdi/putoversend/PutOverSend.h | 4 +-
sys/messaging/tests/dcmf/send/eager/eager_func.cc | 2 +-
.../tests/dcmf/send/eager/eager_latency.cc | 2 +-
.../tests/dcmf/send/eager/eager_latency_offaxis.cc | 2 +-
sys/messaging/tests/dcmf/send/eager/eager_mmps.cc | 2 +-
.../tests/dcmf/send/rendezvous/rzv_func.cc | 2 +-
.../tests/dcmf/send/rendezvous/rzv_latency.cc | 2 +-
.../dcmf/send/rendezvous/rzv_latency_offaxis.cc | 2 +-
sys/messaging/tests/dcmf/util/memregion.h | 2 +-
12 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/lib/ga/Makefile b/lib/ga/Makefile
index c9d1892..52c7344 100644
--- a/lib/ga/Makefile
+++ b/lib/ga/Makefile
@@ -18,25 +18,26 @@ else
-include ${ROOTDIR}/build/dcmf/Make.rules
endif
+#GA_DIR = ga-toolkit
+GA_DIR = ga-4-1.new
+
ifeq (${PLATFORM},BGP)
# ----------------- basic definitions --------------------------------------
- # Uncomment the following two lines to compile GA/ARMCI from the
+ export TARGET = BGP
+ export BGDRIVER = ${BGPINSTALL_DIR}
+
+ # Uncomment the following line to compile GA/ARMCI from the
# installed driver (ppcfloor) and *not* from the work directory.
- #export BG_COMMPATH = ${BGPFLOOR_DIR}/comm
- #export BGP_COMM_PATH = ${BGPFLOOR_DIR}/comm
+ #export BGDRIVER = ${BGPFLOOR_DIR}
- export TARGET = DCMF
- export F77LINUX = ${BG_COMMPATH}/bin/mpif77 -fno-second-underscore -funderscoring
- export CCLINUX = ${BG_COMMPATH}/bin/mpicc
+ export F77LINUX = ${BGDRIVER}/comm/bin/mpif77 -fno-second-underscore -funderscoring
+ export CCLINUX = ${BGDRIVER}/comm/bin/mpicc
export ARLINUX = ${AR_LINUX}
export ASLINUX = ${AS_LINUX}
- export CPPLINUX = ${BG_COMMPATH}/bin/mpicxx
+ export CPPLINUX = ${BGDRIVER}/comm/bin/mpicxx
export RANLIBLINUX = ${RANLIB_LINUX}
- export BG_COMMPATH = ${BGP_COMM_PATH}
export BG_RUNTIMEPATH = ${BGP_RUNTIME_PATH}
- #export TARGET = ARMCIX
- #export ARMCIX = dcmf
export BGCOMPILERS = ${BGP_GNU_LINUX_PATH}/bin/
@@ -44,9 +45,8 @@ ifeq (${PLATFORM},BGP)
export MSG_COMMS = DCMFMPI
export USE_MPI = yes
- export MPI_INCLUDE = .
- export BGMLMPI_INCLUDE = .
- export MPI_LIB = . -lfmpich_.cnk
+ export MPI_INCLUDE = ${BGDRIVER}/comm/include
+ export MPI_LIB = ${BGDRIVER}/comm/lib
export LIBMPI = -lfmpich_.cnk
endif
@@ -77,52 +77,57 @@ clean:: clean-ga
ga::
@echo "==== Compiling Global Arrays with DCMF ===="
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit
+ @echo "${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}
ga-test:: ga
@echo "==== Compiling Global Arrays tests with DCMF ===="
- @echo "Compiling `pwd`/toolkit/global/testing/test.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing test.x
- @echo "Compiling `pwd`/toolkit/global/testing/testmult.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing testmult.x
- @echo "Compiling `pwd`/toolkit/global/testing/patch.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing patch.x
- @echo "Compiling `pwd`/toolkit/global/testing/ndim.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing ndim.x
- @echo "Compiling `pwd`/toolkit/global/testing/testsolve.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing testsolve.x
- @echo "Compiling `pwd`/toolkit/global/testing/testeig.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing testeig.x
- @echo "Compiling `pwd`/toolkit/global/testing/perf.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing perf.x
- @echo "Compiling `pwd`/toolkit/global/testing/testc.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing testc.x
- @echo "Compiling `pwd`/toolkit/global/testing/ntestc.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing ntestc.x
- @echo "Compiling `pwd`/toolkit/global/testing/ga-mpi.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing ga-mpi.x
- @echo "Compiling `pwd`/toolkit/global/testing/ngatest.x"
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/global/testing ngatest.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/test.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing test.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/testmult.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing testmult.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/patch.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing patch.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/ndim.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing ndim.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/testsolve.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing testsolve.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/testeig.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing testeig.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/perf.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing perf.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/testc.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing testc.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/ntestc.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing ntestc.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/ga-mpi.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing ga-mpi.x
+ @echo "Compiling ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing/ngatest.x"
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/global/testing ngatest.x
clean-ga::
@echo "==== Cleaning Global Arrays ==============="
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit clean
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR} clean
+ @${RM} -rv ${ROOTDIR}/lib/dev/${GA_DIR}/include
+ @${RM} -rv ${ROOTDIR}/lib/dev/${GA_DIR}/lib
armci::
@echo "==== Compiling ARMCI with DCMF ===="
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/armci/src
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/armci/src
armci-test::
@echo "==== Compiling ARMCI test with DCMF ===="
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/armci/src test.x test-ibm.x perf.x
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/armci/src test.x test-ibm.x perf.x
clean-armci::
@echo "==== Cleaning ARMCI ==============="
- @${MAKE} -seC ${ROOTDIR}/lib/dev/ga-toolkit/armci/src clean
+ @${MAKE} -seC ${ROOTDIR}/lib/dev/${GA_DIR}/armci/src clean
test::
@echo "==== Print environment variables ===="
- @echo "BG_COMMPATH = ${BG_COMMPATH}"
+ @echo "BGPINSTALL_DIR = ${BGPINSTALL_DIR}"
+ @echo "ROOTDIR = ${ROOTDIR}"
+ @echo "BGDRIVER = ${BGDRIVER}"
@echo "AR_LINUX = ${AR_LINUX}"
@echo "AS_LINUX = ${AS_LINUX}"
@echo "RANLIB_LINUX = ${RANLIB_LINUX}"
diff --git a/sys/include/dcmf.h b/sys/include/dcmf.h
index 50de1d5..6477510 100644
--- a/sys/include/dcmf.h
+++ b/sys/include/dcmf.h
@@ -60,7 +60,7 @@
*
* \ingroup VERSION
*/
-#define DCMF_VERSION_MAJOR 2
+#define DCMF_VERSION_MAJOR 3
/**
* \brief The minor version for this DCMF installation.
@@ -72,7 +72,7 @@
*
* \ingroup VERSION
*/
-#define DCMF_VERSION_MINOR 1
+#define DCMF_VERSION_MINOR 0
#ifdef __cplusplus
extern "C"
@@ -222,9 +222,9 @@ extern "C"
*/
typedef enum
{
- DCMF_TorusNetwork=0,
- DCMF_SocketNetwork,
- DCMF_DefaultNetwork,
+ DCMF_DEFAULT_NETWORK = 0,
+ DCMF_TORUS_NETWORK,
+ DCMF_SOCKET_NETWORK,
DCMF_NETWORK_COUNT
}
DCMF_Network;
diff --git a/sys/messaging/protocols/prod/get/cdi/getoversend/GetOverSend.cc b/sys/messaging/protocols/prod/get/cdi/getoversend/GetOverSend.cc
index fcdf559..530b86d 100644
--- a/sys/messaging/protocols/prod/get/cdi/getoversend/GetOverSend.cc
+++ b/sys/messaging/protocols/prod/get/cdi/getoversend/GetOverSend.cc
@@ -433,7 +433,7 @@ namespace DCMF
posix_memalign(&r_alloc,16,sizeof(*_putreg));
_putreg = (DCMF_Protocol_t *)r_alloc;
put_cfg.protocol = DCMF_DEFAULT_SEND_PROTOCOL;
- put_cfg.network = DCMF_DefaultNetwork;
+ put_cfg.network = DCMF_DEFAULT_NETWORK;
put_cfg.cb_recv = put_send_l_cb;
put_cfg.cb_recv_clientdata = this;
put_cfg.cb_recv_short = put_send_s_cb;
@@ -443,7 +443,7 @@ namespace DCMF
posix_memalign(&r_alloc,16,sizeof(*_getreg));
_getreg = (DCMF_Protocol_t *)r_alloc;
get_cfg.protocol = DCMF_DEFAULT_SEND_PROTOCOL;
- get_cfg.network = DCMF_DefaultNetwork;
+ get_cfg.network = DCMF_DEFAULT_NETWORK;
get_cfg.cb_recv = get_send_l_cb;
get_cfg.cb_recv_clientdata = _putreg;
get_cfg.cb_recv_short = get_send_s_cb;
diff --git a/sys/messaging/protocols/prod/put/cdi/putoversend/PutOverSend.h b/sys/messaging/protocols/prod/put/cdi/putoversend/PutOverSend.h
index 0eecbc5..14ec4de 100644
--- a/sys/messaging/protocols/prod/put/cdi/putoversend/PutOverSend.h
+++ b/sys/messaging/protocols/prod/put/cdi/putoversend/PutOverSend.h
@@ -189,7 +189,7 @@ namespace DCMF
_putackReg = (DCMF_Protocol_t *)malloc(sizeof(*_putackReg));
DCMF_assert(_putackReg != NULL);
send_cfg.protocol = DCMF_DEFAULT_SEND_PROTOCOL;
- send_cfg.network = DCMF_DefaultNetwork;
+ send_cfg.network = DCMF_DEFAULT_NETWORK;
send_cfg.cb_recv_short = put_ack_s_cb;
send_cfg.cb_recv_short_clientdata = NULL;
send_cfg.cb_recv = put_ack_l_cb;
@@ -198,7 +198,7 @@ namespace DCMF
_sendRegistration = (DCMF_Protocol_t *)malloc(sizeof(*_sendRegistration));
DCMF_assert(_sendRegistration != NULL);
send_cfg.protocol = DCMF_DEFAULT_SEND_PROTOCOL;
- send_cfg.network = DCMF_DefaultNetwork;
+ send_cfg.network = DCMF_DEFAULT_NETWORK;
send_cfg.cb_recv_short = put_send_s_cb;
send_cfg.cb_recv_short_clientdata = _putackReg;
send_cfg.cb_recv = put_send_l_cb;
diff --git a/sys/messaging/tests/dcmf/send/eager/eager_func.cc b/sys/messaging/tests/dcmf/send/eager/eager_func.cc
index f523c19..872dcb8 100644
--- a/sys/messaging/tests/dcmf/send/eager/eager_func.cc
+++ b/sys/messaging/tests/dcmf/send/eager/eager_func.cc
@@ -21,7 +21,7 @@ int main ()
DCMF_Messager_initialize ();
// Configure and register an eager point-to-point send
- DCMF_Send_Configuration_t eager_config = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DefaultNetwork, NULL, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t eager_config = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, NULL, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &eager_config);
return test ();
diff --git a/sys/messaging/tests/dcmf/send/eager/eager_latency.cc b/sys/messaging/tests/dcmf/send/eager/eager_latency.cc
index 473833d..debacd5 100644
--- a/sys/messaging/tests/dcmf/send/eager/eager_latency.cc
+++ b/sys/messaging/tests/dcmf/send/eager/eager_latency.cc
@@ -19,7 +19,7 @@ int main ()
DCMF_Messager_initialize ();
// Configure and register an eager point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DefaultNetwork, cb_recv_new_short, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_new_short, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &c);
/* Display some test header information */
diff --git a/sys/messaging/tests/dcmf/send/eager/eager_latency_offaxis.cc b/sys/messaging/tests/dcmf/send/eager/eager_latency_offaxis.cc
index 3b81730..21f5cb3 100644
--- a/sys/messaging/tests/dcmf/send/eager/eager_latency_offaxis.cc
+++ b/sys/messaging/tests/dcmf/send/eager/eager_latency_offaxis.cc
@@ -27,7 +27,7 @@ int main ()
}
// Configure and register an eager point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DefaultNetwork, cb_recv_new_short, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_new_short, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &c);
/* Display some test header information */
diff --git a/sys/messaging/tests/dcmf/send/eager/eager_mmps.cc b/sys/messaging/tests/dcmf/send/eager/eager_mmps.cc
index 74c006a..9f3629c 100644
--- a/sys/messaging/tests/dcmf/send/eager/eager_mmps.cc
+++ b/sys/messaging/tests/dcmf/send/eager/eager_mmps.cc
@@ -19,7 +19,7 @@ int main ()
DCMF_Messager_initialize ();
// Configure and register an eager point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DefaultNetwork, cb_recv_new_short, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_EAGER_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_new_short, NULL, cb_recv_new, NULL };
DCMF_Send_register (&_protocol, &c);
/* Display some test header information */
diff --git a/sys/messaging/tests/dcmf/send/rendezvous/rzv_func.cc b/sys/messaging/tests/dcmf/send/rendezvous/rzv_func.cc
index 37a87fc..23c4b8a 100644
--- a/sys/messaging/tests/dcmf/send/rendezvous/rzv_func.cc
+++ b/sys/messaging/tests/dcmf/send/rendezvous/rzv_func.cc
@@ -19,7 +19,7 @@ int main ()
DCMF_Messager_initialize ();
// Configure and register an rendezvous point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DefaultNetwork, NULL, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, NULL, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &c);
return test ();
diff --git a/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency.cc b/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency.cc
index f4c2395..9d5488c 100644
--- a/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency.cc
+++ b/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency.cc
@@ -19,7 +19,7 @@ int main ()
DCMF_Messager_initialize ();
// Configure and register an rendezvous point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DefaultNetwork, cb_recv_new_short, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_new_short, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &c);
/* Display some test header information */
diff --git a/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency_offaxis.cc b/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency_offaxis.cc
index 5f7c3ce..5898494 100644
--- a/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency_offaxis.cc
+++ b/sys/messaging/tests/dcmf/send/rendezvous/rzv_latency_offaxis.cc
@@ -27,7 +27,7 @@ int main ()
}
// Configure and register an rendezvous point-to-point send
- DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DefaultNetwork, cb_recv_new_short, NULL, cb_recv_new, NULL };
+ DCMF_Send_Configuration_t c = { DCMF_RZV_SEND_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_new_short, NULL, cb_recv_new, NULL };
DCMF_Send_register (&protocol, &c);
/* Display some test header information */
diff --git a/sys/messaging/tests/dcmf/util/memregion.h b/sys/messaging/tests/dcmf/util/memregion.h
index 9a59c42..e2fad3d 100644
--- a/sys/messaging/tests/dcmf/util/memregion.h
+++ b/sys/messaging/tests/dcmf/util/memregion.h
@@ -43,7 +43,7 @@ void window_init (memregion_window_t * window)
{
DCMF_CriticalSection_enter (0);
- DCMF_Control_Configuration_t c = { DCMF_DEFAULT_CONTROL_PROTOCOL, DCMF_DefaultNetwork, cb_recv_memregion, window };
+ DCMF_Control_Configuration_t c = { DCMF_DEFAULT_CONTROL_PROTOCOL, DCMF_DEFAULT_NETWORK, cb_recv_memregion, window };
if (DCMF_SUCCESS == DCMF_Control_register (&window->exchange_memregion_protocol, &c))
{
window->active = 0;
--
1.6.0.4.1.g57b5
More information about the dcmf
mailing list