Commit 710b2c5c authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

uploading update to README


Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent c1114f17
......@@ -14,11 +14,8 @@ project(exatn LANGUAGES CXX Fortran)
option(CUDA_HOST_COMPILER "Provide the host compiler for nvcc" "")
option(EXATN_BUILD_TESTS "Build ExaTN tests" OFF)
option(EXATENSOR_ROOT "The root of the ExaTensor install, will contain include/lib directories" /usr)
include(CTest)
link_directories(${EXATENSOR_ROOT}/lib)
include_directories(${EXATENSOR_ROOT}/include)
find_package(MPI REQUIRED)
find_package(OpenMP REQUIRED)
......@@ -28,7 +25,7 @@ if (OpenMP_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
endif()
link_directories(${CMAKE_SOURCE_DIR}/tpls/ExaTensor-devel/lib)
link_directories(${CMAKE_SOURCE_DIR}/tpls/ExaTensor/lib)
add_subdirectory(tpls)
add_subdirectory(src)
......@@ -8,8 +8,11 @@ GCC 8.0+, CUDA 9/10, MPI, CMake (for build)
## Build instructions
Note that for now, developers must clone ExaTensor manually
``` bash
$ (from top-level exatn) mkdir build && cd build
(from top-level exatn)
$ git clone https://gitlab.com/DmitryLyakh/ExaTensor tpls/ExaTensor
$ mkdir build && cd build
$ cmake .. -DEXATN_BUILD_TESTS=TRUE -DCUDA_HOST_COMPILER=$(which g++-5)
$ make
```
......
......@@ -34,8 +34,6 @@ if(EXATN_BUILD_TESTS)
endmacro()
endif()
include(ExternalProject)
list(GET MPI_Fortran_INCLUDE_PATH 0 MPI_FORTRAN_INCLUDE)
get_filename_component(MPI_ROOT_DIR ${MPI_FORTRAN_INCLUDE} DIRECTORY)
get_filename_component(MPI_BIN_PATH ${MPI_CXX_COMPILER} DIRECTORY)
......@@ -59,7 +57,7 @@ if(CUDA_FOUND)
PATH_OPENMPI_LIB=${MPI_ROOT_DIR}/lib
PATH_OPENMPI_BIN=${MPI_BIN_PATH} CUDA_HOST_COMPILER=${CUDA_HOST_COMPILER}
make
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor-devel)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor)
else()
add_custom_target(
exatensor-build
......@@ -68,7 +66,7 @@ if(CUDA_FOUND)
PATH_OPENMPI_INC=${MPI_ROOT_DIR}/include
PATH_OPENMPI_LIB=${MPI_ROOT_DIR}/lib
PATH_OPENMPI_BIN=${MPI_BIN_PATH} make
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor-devel)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor)
endif()
else()
add_custom_target(
......@@ -76,6 +74,6 @@ else()
COMMAND ${CMAKE_COMMAND} -E env MPILIB=OPENMPI BLASLIB=ATLAS
PATH_OPENMPI_INC=${MPI_ROOT_DIR}/include
PATH_OPENMPI_LIB=${MPI_ROOT_DIR}/lib
PATH_OPENMPI_BIN=${MPI_BIN_PATH} VERBOSE=1 make
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor-devel)
PATH_OPENMPI_BIN=${MPI_BIN_PATH} make
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ExaTensor)
endif()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment