Commit d25c3d35 authored by uldis_l's avatar uldis_l
Browse files

DKS support

parent 91729f85
......@@ -25,9 +25,9 @@ IF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
SET (CMAKE_BUILD_TYPE RelWithDebInfo)
ENDIF (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
SET (CMAKE_CXX_FLAGS_RELEASE "-O2")
SET (CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g")
SET (CMAKE_CXX_FLAGS_RELEASE "-O3")
SET (CMAKE_CXX_FLAGS_DEBUG "-O3 -g")
### CXX_FLAGS specific to build type ########################
IF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
......@@ -54,8 +54,60 @@ SET (OTHER_CXX_FLAGS
"-Wall ${OTHER_CXX_FLAGS}"
)
### Uldis Locans 2014.09.05 ###
OPTION (ENABLE_OPENCL "Enable OpenCL" ON)
OPTION (ENABLE_CUDA "Enable CUDA" ON)
OPTION (ENABLE_OPENMP "Enable OpenMP + offload" OFF)
OPTION (USE_OPENCL "Use OpenCL" OFF)
OPTION (USE_CUDA "Use CUDA" ON)
OPTION (USE_MIC "Use MIC" OFF)
### Load DKS package ###
IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
FIND_PACKAGE(DKS REQUIRED HINTS $ENV{DKS_PREFIX} $ENV{DKS_DIR} $ENV{DKS})
MESSAGE (STATUS "Found DKS library: ${DKS_LIBRARY_DIR}")
MESSAGE (STATUS "Found DKS include dir: ${DKS_INCLUDE_DIR}")
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DDKS_MPI")
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
### OpenCL compiler flags ###
IF (ENABLE_OPENCL)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -lOpenCL -pthread -DDKS_OPENCL")
ENDIF (ENABLE_OPENCL)
### End OpenCL ###
### CUDA compiler flags ###
IF (ENABLE_CUDA)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -lcudart -lcufft -lcublas -lnvToolsExt -DDKS_CUDA")
ENDIF (ENABLE_CUDA)
### End Cuda ###
### MIC compiler flags ###
IF (ENABLE_OPENMP)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -openmp -DDKS_MIC")
ENDIF (ENABLE_OPENMP)
### END MIC ###
### if any accelerator enabled set flag to use DKS ###
IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DIPPL_DKS")
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_OPENMP)
### select API for DKS (temporary - will be moved to runtime) ###
IF (USE_OPENCL)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DIPPL_DKS_OPENCL")
ENDIF (USE_OPENCL)
IF (USE_CUDA)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DIPPL_DKS_CUDA")
ENDIF (USE_CUDA)
IF (USE_MIC)
SET (IPPL_CXX_FLAGS "${IPPL_CXX_FLAGS} -DIPPL_DKS_MIC")
ENDIF (USE_MIC)
### CXX_FLAGS specific to compiler and platform #############
MESSAGE (STATUS "Your compiler is: ${CMAKE_CXX_COMPILER}")
IF (LINUXGCC)
MESSAGE (STATUS "Linux GCC flags SET")
SET (IPPL_CXX_FLAGS
......@@ -66,8 +118,10 @@ IF (LINUXGCC)
)
# compiler dependent flags
MESSAGE (STATUS "Your compiler is: ${CMAKE_CXX_COMPILER}")
STRING (REGEX REPLACE ".*/([A-Za-z]*)$" "\\1" COMPILER_NAME ${CMAKE_CXX_COMPILER})
MESSAGE (STATUS "Your compiler is: ${COMPILER_NAME}")
MESSAGE (STATUS "Your compiler is: ${CMAKE_CXX_COMPILER}")
IF ("${COMPILER_NAME}" STREQUAL "mpicxx")
......@@ -77,6 +131,7 @@ IF (LINUXGCC)
EXECUTE_PROCESS (COMMAND ${CMAKE_CXX_COMPILER} -show
OUTPUT_VARIABLE MPI_COMPILER_OUTPUT
ERROR_VARIABLE MPI_COMPILER_ERROR)
IF ("${MPI_COMPILER_ERROR}" STREQUAL "")
STRING (REGEX REPLACE "([A-Za-z]*) .*$" "\\1" MPI_UNDERLYING_COMPILER ${MPI_COMPILER_OUTPUT})
......
......@@ -144,12 +144,23 @@ SET (MAKE_DEF
../test/Makefile.def
)
INCLUDE_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR}
)
IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
MESSAGE (STATUS "DKS include dirs: ${DKS_INCLUDE_DIR}")
INCLUDE_DIRECTORIES (${DKS_INCLUDE_DIR})
LINK_DIRECTORIES(${DKS_LIBRARY_DIR})
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
ADD_LIBRARY ( ippl ${IPPL_SRCS} ${IPPL_SRCS_FORT} )
IF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
TARGET_LINK_LIBRARIES(ippl dks)
ENDIF (ENABLE_OPENCL OR ENABLE_CUDA OR ENABLE_MIC)
INSTALL (FILES ${MAKE_DEF} DESTINATION lib)
INSTALL (TARGETS ippl DESTINATION lib)
INSTALL (FILES ${IPPL_BASEDIR_HDRS} DESTINATION include)
This diff is collapsed.
This diff is collapsed.
......@@ -87,6 +87,7 @@ public:
// This should NOT be called if the field was constructed by providing
// a FieldLayout.
void initialize(Layout_t &);
void initialize(Layout_t &, const bool); //UL: for pinned memory allocation
void initialize(Layout_t &, const GuardCellSizes<Dim>&);
// Some typedefs to make access to the maps a bit simpler.
......@@ -357,6 +358,9 @@ private:
// compression flags
bool compressible_m; // are we allowed to compress this BareField?
//UL: for pinned memory allocation
bool pinned;
};
//////////////////////////////////////////////////////////////////////
......@@ -371,7 +375,8 @@ BareField<T,Dim>::
BareField()
: Layout(0), // No layout yet.
Gc( GuardCellSizes<Dim>(0U) ), // No guard cells.
compressible_m(!Ippl::noFieldCompression)
compressible_m(!Ippl::noFieldCompression),
pinned(false) //UL: for pinned memory allocation
{
}
......@@ -386,7 +391,8 @@ BareField<T,Dim>::
BareField(Layout_t & l)
: Layout(&l), // Just record the layout.
Gc( GuardCellSizes<Dim>(0U) ), // No guard cells.
compressible_m(!Ippl::noFieldCompression)
compressible_m(!Ippl::noFieldCompression),
pinned(false) //UL: for pinned memory allocation
{
setup(); // Do the common setup chores.
}
......@@ -402,7 +408,8 @@ BareField<T,Dim>::
BareField(Layout_t & l, const GuardCellSizes<Dim>& g)
: Layout(&l), // Just record the layout.
Gc(g), // Just record guard cells.
compressible_m(!Ippl::noFieldCompression)
compressible_m(!Ippl::noFieldCompression),
pinned(false) //UL: for pinned memory allocation
{
setup(); // Do the common setup chores.
}
......
......@@ -59,7 +59,8 @@ template< class T, unsigned Dim >
BareField<T,Dim>::BareField(const BareField<T,Dim>& a)
: Layout( a.Layout ), // Copy the layout.
Gc( a.Gc ), // Copy the number of guard cells.
compressible_m( a.compressible_m )
compressible_m( a.compressible_m ),
pinned(false) //UL: for pinned memory allocation
{
......@@ -118,6 +119,21 @@ BareField<T,Dim>::initialize(Layout_t & l) {
}
}
//UL: for pinned memory allocation
template< class T, unsigned Dim >
void
BareField<T,Dim>::initialize(Layout_t & l, const bool p) {
// if our Layout has been previously set, we just ignore this request
if (Layout == 0) {
Layout = &l;
pinned = p;
setup();
}
}
template< class T, unsigned Dim >
void
BareField<T,Dim>::initialize(Layout_t & l,
......@@ -176,7 +192,12 @@ BareField<T,Dim>::setup()
int vnode = (*v_i).second->getVnode();
// Construct the LField for this Vnode.
LField<T,Dim> *lf = new LField<T,Dim>( owned, guarded, vnode );
//UL: for pinned memory allocation
LField<T, Dim> *lf;
if (pinned)
lf = new LField<T,Dim>( owned, guarded, vnode, pinned );
else
lf = new LField<T,Dim>( owned, guarded, vnode );
// Put it in the list.
Locals_ac.insert( end_if(),
......
......@@ -92,6 +92,7 @@ public:
// Initialize the Field, also specifying a mesh
void initialize(Mesh_t&, Layout_t &);
void initialize(Mesh_t&, Layout_t &, const bool); //UL: for pinned memory allocation
void initialize(Mesh_t&, Layout_t &, const GuardCellSizes<Dim>&);
void initialize(Mesh_t&, Layout_t &, const BConds<T,Dim,M,C>&);
void initialize(Mesh_t&, Layout_t &, const GuardCellSizes<Dim>&,
......
......@@ -302,6 +302,15 @@ void Field<T,Dim,M,C>::initialize(Mesh_t& m, Layout_t & l) {
store_mesh(&m, false);
}
//UL: for pinned memory allocation
template<class T, unsigned Dim, class M, class C>
void Field<T,Dim,M,C>::initialize(Mesh_t& m, Layout_t & l, const bool p) {
BareField<T,Dim>::initialize(l, p);
store_mesh(&m, false);
}
template<class T, unsigned Dim, class M, class C>
void Field<T,Dim,M,C>::initialize(Mesh_t& m, Layout_t & l,
const GuardCellSizes<Dim>& gc) {
......
......@@ -74,6 +74,12 @@ public:
const NDIndex<Dim>& allocated,
int vnode = -1);
//UL: for pinned memory allocation
LField(const NDIndex<Dim>& owned,
const NDIndex<Dim>& allocated,
int vnode,
bool p);
// Copy constructor.
LField(const LField<T,Dim>&);
......@@ -217,6 +223,10 @@ private:
T* P;
// UL: for pinned memory allocation
bool Pinned;
// What domain in the data is owned by this LField.
NDIndex<Dim> Owned;
......@@ -264,13 +274,12 @@ private:
// Actualy allocate storage for the LField data, doing any special
// memory tricks needed for performance. Sets P pointer to new memory.
void allocateStorage(int newsize);
// Actually free the storage used in the LField, if any. Resets P to zero.
void deallocateStorage();
// Disable default constructor and operator=
LField();
......
......@@ -97,8 +97,38 @@ template<class T, unsigned Dim>
LField<T,Dim>::LField(const NDIndex<Dim>& owned,
const NDIndex<Dim>& allocated,
int vnode)
: vnode_m(vnode),
P(0),
Pinned(false),
Owned(owned),
Allocated(allocated),
Begin(owned, CompressedData),
End(CompressedData),
overlapCacheInited(false),
allocCompressIndex(0),
ownedCompressIndex(-1),
offsetBlocks(Unique::get() % IPPL_OFFSET_BLOCKS)
{
// Give the LField some initial (compressed) value
LFieldInitializer<T>::apply(*Begin);
// If we are not actually doing compression, expand the storage out,
// and copy the initial value to all the elements
if (IpplInfo::noFieldCompression)
this->ReallyUncompress(true);
//INCIPPLSTAT(incLFields);
}
//UL: for pinned mempory allocation
template<class T, unsigned Dim>
LField<T,Dim>::LField(const NDIndex<Dim>& owned,
const NDIndex<Dim>& allocated,
int vnode, bool p)
: vnode_m(vnode),
P(0),
Pinned(p),
Owned(owned),
Allocated(allocated),
Begin(owned, CompressedData),
......@@ -120,7 +150,6 @@ LField<T,Dim>::LField(const NDIndex<Dim>& owned,
//INCIPPLSTAT(incLFields);
}
//////////////////////////////////////////////////////////////////////
//
// Deep copy constructor.
......@@ -131,6 +160,7 @@ template<class T, unsigned Dim>
LField<T,Dim>::LField(const LField<T,Dim>& lf)
: vnode_m(lf.vnode_m),
P(0),
Pinned(false),
Owned(lf.Owned),
Allocated(lf.Allocated),
Begin(CompressedData),
......@@ -680,6 +710,8 @@ LField<T,Dim>::swapData( LField<T,Dim>& a )
//
//////////////////////////////////////////////////////////////////////
// allocate memory for LField and if DKS is used and page-locked (pl) is +1 allocate
// page-locked memory for storage
template<class T, unsigned Dim>
void
LField<T,Dim>::allocateStorage(int newsize)
......@@ -696,11 +728,35 @@ LField<T,Dim>::allocateStorage(int newsize)
// Allocate the storage, creating some extra to account for offset, and
// then add in the offset.
// If DKS is used allocete in page-locked memory to increase data transfer speed and
// allow asynchronous data transfer
//#ifdef IPPL_DKS
//Ippl::DKS->allocateHostMemory(P, newsize+extra);
//#elif IPPL_DIRECTIO
#ifdef IPPL_DIRECTIO
P = (T *)valloc(sizeof(T) * (newsize + extra));
if (Pinned) {
#ifdef IPPL_DKS
Ippl::DKS->allocateHostMemory(P, newsize+extra);
#else
P = new T[newsize + extra];
P = (T *)valloc(sizeof(T) * (newsize + extra));
#endif
} else {
P = (T *)valloc(sizeof(T) * (newsize + extra));
}
#else
if (Pinned) {
#ifdef IPPL_DKS
Ippl::DKS->allocateHostMemory(P, newsize+extra);
#else
P = new T[newsize + extra];
#endif
} else {
P = new T[newsize + extra];
}
#endif
P += extra;
......@@ -728,10 +784,34 @@ LField<T,Dim>::deallocateStorage()
// Free the storage
//if DKS is used free page-locked host memory
//#ifdef IPPL_DKS
//Ippl::DKS->freeHostMemory(P, -1);
//#elif IPPL_DIRECTIO
#ifdef IPPL_DIRECTIO
free(P);
if(Pinned) {
#ifdef IPPL_DKS
Ippl::DKS->freeHostMemory(P, -1);
#else
free(P);
#endif
} else {
free(P);
}
#else
if (Pinned) {
#ifdef IPPL_DKS
Ippl::DKS->freeHostMemory(P, -1);
#else
delete [] P;
delete [] P;
#endif
} else {
delete [] P;
}
#endif
// Reset our own pointer to zero
......
......@@ -49,6 +49,24 @@ Inform *IpplInfo::Warn = new Inform("Warning", std::cerr);
Inform *IpplInfo::Error = new Inform("Error", std::cerr, INFORM_ALL_NODES);
Inform *IpplInfo::Debug = new Inform("**DEBUG**", std::cerr, INFORM_ALL_NODES);
//dks base member of IpplInfo initialized to default values
#ifdef IPPL_DKS
#ifdef IPPL_DKS_CUDA
DKSBase *IpplInfo::DKS = new DKSBase("Cuda", "-gpu");
#endif
#ifdef IPPL_DKS_OPENCL
DKSBase *IpplInfo::DKS = new DKSBase("OpenCL", "-gpu");
#endif
#ifdef IPPL_DKS_MIC
DKSBase *IpplInfo::DKS = new DKSBase("OpenCL", "-mic");
#endif
#endif
// should we use the optimization of deferring guard cell fills until
// absolutely needed? Can be changed to true by specifying the
// flag --defergcfill
......
......@@ -54,6 +54,12 @@
//(without further increasing the number of defines).
#include <mpi.h>
//DKS include
#ifdef IPPL_DKS
#include "DKSBase.h"
#endif
// forward declarations
class IpplStats;
class IpplInfo;
......@@ -93,6 +99,10 @@ public:
// the statistics collection object
static IpplStats *Stats;
#ifdef IPPL_DKS
static DKSBase *DKS;
#endif
public:
// Constructor 1: specify the argc, argv values from the cmd line.
// The second argument controls whether the IPPL-specific command line
......@@ -301,6 +311,7 @@ public:
static void printStatistics(Inform&);
private:
static MPI_Comm communicator_m;
// Static counter indicating how many IpplInit objects have been created.
......
......@@ -30,24 +30,30 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake
CMAKE_COMMAND = /afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
RM = /afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
# The program to use to edit the cache.
CMAKE_EDIT_COMMAND = /usr/bin/ccmake
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/uldisl/OPAL/IPPL_TAU/trunk
CMAKE_SOURCE_DIR = /home/l_locans/programs/IPPL/trunk
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/uldisl/OPAL/IPPL_TAU/trunk
CMAKE_BINARY_DIR = /home/l_locans/programs/IPPL/trunk
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
/usr/bin/cmake -i .
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
# Special rule for the target edit_cache
......@@ -57,19 +63,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
......@@ -79,7 +85,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
......@@ -98,7 +104,7 @@ list_install_components/fast: list_install_components
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
/afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
......@@ -107,14 +113,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(CMAKE_COMMAND) -E cmake_progress_start /home/uldisl/OPAL/IPPL_TAU/trunk/CMakeFiles /home/uldisl/OPAL/IPPL_TAU/trunk/test/6dtrack/CMakeFiles/progress.marks
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/uldisl/OPAL/IPPL_TAU/trunk/CMakeFiles 0
cd /home/l_locans/programs/IPPL/trunk && $(CMAKE_COMMAND) -E cmake_progress_start /home/l_locans/programs/IPPL/trunk/CMakeFiles /home/l_locans/programs/IPPL/trunk/test/6dtrack/CMakeFiles/progress.marks
cd /home/l_locans/programs/IPPL/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/l_locans/programs/IPPL/trunk/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/clean
cd /home/l_locans/programs/IPPL/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/clean
.PHONY : clean
# The main clean target
......@@ -123,17 +129,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/preinstall
cd /home/l_locans/programs/IPPL/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/preinstall
cd /home/l_locans/programs/IPPL/trunk && $(MAKE) -f CMakeFiles/Makefile2 test/6dtrack/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
cd /home/l_locans/programs/IPPL/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
......@@ -159,6 +165,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
cd /home/uldisl/OPAL/IPPL_TAU/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
cd /home/l_locans/programs/IPPL/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
......@@ -30,24 +30,30 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
CMAKE_COMMAND = /usr/bin/cmake
CMAKE_COMMAND = /afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
RM = /afs/psi.ch/sys/psi.x86_64_slp6/Programming/cmake/2.8.12.2/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
# The program to use to edit the cache.
CMAKE_EDIT_COMMAND = /usr/bin/ccmake
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/uldisl/OPAL/IPPL_TAU/trunk
CMAKE_SOURCE_DIR = /home/l_locans/programs/IPPL/trunk
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/uldisl/OPAL/IPPL_TAU/trunk
CMAKE_BINARY_DIR = /home/l_locans/programs/IPPL/trunk
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
/usr/bin/cmake -i .
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache