Skip to content

zodiac: fix compilation with OTF #2682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berquist wants to merge 1 commit into
base: devel
Choose a base branch
from
+13 −23
Open

zodiac: fix compilation with OTF #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions config/sst_check_otf.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,25 @@ AC_DEFUN([SST_CHECK_OTF],

AS_IF([test "$with_otf" = "no"], [sst_check_otf_happy="no"])

CXXFLAGS_saved="$CXXFLAGS"
CPPFLAGS_saved="$CPPFLAGS"
LDFLAGS_saved="$LDFLAGS"
LIBS_saved="$LIBS"

AS_IF([test "$sst_check_otf_happy" = "yes"], [
AS_IF([test ! -z "$with_otf" -a "$with_otf" != "yes"],
[OTF_PATH="$with_otf/bin/:$PATH"
OTF_CPPFLAGS="-I$with_otf/include"
CPPFLAGS="$OTF_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
OTF_LDFLAGS="-L$with_otf/lib"
LDFLAGS="$OTF_LDFLAGS $AM_LDFLAGS $LDFLAGS"],
[OTF_CPPFLAGS=
OTF_LDFLAGS=])])
[OTF_PATH="$with_otf/bin/:$PATH"])])

AC_PATH_PROG([OTF_CONFIG_TOOL],[otfconfig],[],[$OTF_PATH])

AS_IF([test "x$OTF_CONFIG_TOOL" = "x"],
[sst_check_otf_happy="no"])
[sst_check_otf_happy="no"
OTF_CPPFLAGS=
OTF_LDFLAGS=]
[OTF_CPPFLAGS=`$OTF_CONFIG_TOOL --includes`
CPPFLAGS="$OTF_CPPFLAGS $AM_CPPFLAGS $CPPFLAGS"
OTF_LDFLAGS=`$OTF_CONFIG_TOOL --libs`
LDFLAGS="$OTF_LDFLAGS $AM_LDFLAGS $LDFLAGS"])

CXXFLAGS="$CXXFLAGS_saved"
CPPFLAGS="$CPPFLAGS_saved"
LDFLAGS="$LDFLAGS_saved"
LIBS="$LIBS_saved"
Expand All @@ -40,7 +37,7 @@ AC_DEFUN([SST_CHECK_OTF],
AC_SUBST([OTF_PATH])

AM_CONDITIONAL([USE_OTF], [test "x$sst_check_otf_happy" = "xyes"])
AS_IF([test "$sst_check_otf_happy" = "yes"], [AC_DEFINE([HAVE_OTF],[1],[Defines whether we have the OFT library])])
AS_IF([test "$sst_check_otf_happy" = "yes"], [AC_DEFINE([HAVE_OTF],[1],[Defines whether we have the OTF library])])

AC_MSG_CHECKING([for OTF library])
AC_MSG_RESULT([$sst_check_otf_happy])
Expand Down
4 changes: 2 additions & 2 deletions src/sst/elements/zodiac/otfreader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int handleOTFSendMsg(void *userData, uint64_t time, uint32_t sender, uint32_t re
OTFReader* reader = (OTFReader*) userData;
std::cout << "OTF: Send message from " << sender << " to " << receiver << " qSize=" << reader->getCurrentQueueSize() << std::endl;

ZodiacSendEvent* sendEv = new ZodiacSendEvent(receiver, length, HERMES_DOUBLE, 0, group);
ZodiacSendEvent* sendEv = new ZodiacSendEvent(receiver, length, DOUBLE, 0, group);
reader->enqueueEvent(sendEv);

return OTF_RETURN_OK;
Expand All @@ -44,7 +44,7 @@ int handleOTFRecvMsg(void *userData, uint64_t time, uint32_t recvProc, uint32_t
OTFReader* reader = (OTFReader*) userData;
std::cout << "OTF: Recv message from " << sendProc << " to " << recvProc << " qSize=" << reader->getCurrentQueueSize() << std::endl;

ZodiacRecvEvent* recvEv = new ZodiacRecvEvent(recvProc, length, HERMES_DOUBLE, 0, group);
ZodiacRecvEvent* recvEv = new ZodiacRecvEvent(recvProc, length, DOUBLE, 0, group);
reader->enqueueEvent(recvEv);

return OTF_RETURN_OK;
Expand Down
6 changes: 1 addition & 5 deletions src/sst/elements/zodiac/zotf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@ ZodiacOTFTraceReader::ZodiacOTFTraceReader(ComponentId_t id, Params& params) :
std::cout << "Creating a new ZOTFTrace Reader..." << std::endl;
string msgiface = params.find<std::string>("msgapi");

if ( msgiface == "" ) {
msgapi = new MessageInterface();
} else {
msgapi = dynamic_cast<MessageInterface*>(loadSubComponent(msgiface, this, params));
msgapi = loadUserSubComponent<Hermes::MP::Interface>(msgiface);

if(NULL == msgapi) {
std::cerr << "Message API: " << msgiface << " could not be loaded." << std::endl;
exit(-1);
}
}

string trace_file = params.find<std::string>("trace");
if("" == trace_file) {
Expand Down
5 changes: 1 addition & 4 deletions src/sst/elements/zodiac/zotf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

#include "otfreader.h"

using namespace std;
using namespace SST::Hermes;

namespace SST {
namespace Zodiac {

Expand All @@ -54,7 +51,7 @@ class ZodiacOTFTraceReader : public SST::Component {

////////////////////////////////////////////////////////

MessageInterface* msgapi;
SST::Hermes::MP::Interface* msgapi;
OTFReader* reader;
std::queue<ZodiacEvent*>* eventQ;

Expand Down
Loading