Commit 8d5eff20 authored by Youngsung Kim's avatar Youngsung Kim
Browse files

adding Windows support; updating Kokkos

parent ec35bc4b

cmake/machine.cmake

+10 −2
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ macro (set_environment) 


set(machinefile_path "")



if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")

  set(SCRIPT_EXT "bat")

else()

  set(SCRIPT_EXT "sh")

endif()



if(EXISTS "${MACHINE}")

  set(machinefile_path "${MACHINE}")
@@ -149,7 +155,7 @@ else() 
  message(STATUS "machine file: ${machinefile_path}")

endif()



if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")

if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")

	run_win_command("${machinefile_path} && set" ENV_OUTPUT)

else()

	run_bash_command("source ${machinefile_path} && env" ENV_OUTPUT)
@@ -217,11 +223,13 @@ set(CMAKE_CXX_FLAGS "${COMPILER_FLAGS} ${COMPILER_FLAGS_APPEND}") 
set(CMAKE_EXE_LINKER_FLAGS "${LINKER_FLAGS} ${LINKER_FLAGS_APPEND}")



if (DEBUG)

    message(STATUS "Searching ${COMPILER}...")

    message(STATUS "CMAKE_CXX_COMPILER is set to ${CMAKE_CXX_COMPILER}")

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTRITON_DEBUG")

endif()



message(STATUS "TRITON_MACHINE=${MACHINE}")

message(STATUS "TRITON_COMPILER=${COMPILER}")

message(STATUS "TRITON_COMPILER=${CMAKE_CXX_COMPILER}")



list(FIND _TRITON_BACKENDS "${BACKEND}" VAR_INDEX)

if(VAR_INDEX EQUAL -1)

cmake/machines/Windows/default_default.bat

0 → 100644
+7 −0
Original line number Diff line number Diff line 
@echo off



set TRITON_BACKEND=SERIAL

set TRITON_ARCH=SKL



set TRITON_COMPILER=mpic++

set TRITON_RUN_COMMAND=mpirun -n 8
 
 No newline at end of file

cmake/util.cmake

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ macro(add_build_and_run_scripts) 
  cmake_host_system_information(RESULT N_PHYSICAL_CORES QUERY NUMBER_OF_PHYSICAL_CORES)



  # create a build script         

  set(_BuildScript ${CMAKE_BINARY_DIR}/triton_build.sh)

  set(_BuildScript ${CMAKE_BINARY_DIR}/triton_build.${SCRIPT_EXT})

  file(WRITE ${_BuildScript}  "#!/usr/bin/env bash\n\n")

  file(APPEND ${_BuildScript} "source ./${ENVFILE}\n\n")

  # On Windows, you can omit -j for Visual Studio, or use -j<num_cores> for Ninja/Mak
@@ -34,7 +34,7 @@ macro(add_build_and_run_scripts) 


  if (ENSEMBLE_BUILD)

    # create an ensemble run script           

    set(_RunScript ${CMAKE_BINARY_DIR}/triton_ensrun.sh)

    set(_RunScript ${CMAKE_BINARY_DIR}/triton_ensrun.${SCRIPT_EXT})

    file(WRITE ${_RunScript}  "#!/usr/bin/env bash\n\n")

    file(APPEND ${_RunScript} "source ./${ENVFILE}\n\n")

    file(APPEND ${_RunScript} "ENSCFG_FILE=\${1:-./ensembles_ensify.yaml}\n")
@@ -52,7 +52,7 @@ macro(add_build_and_run_scripts) 
  else()



    # create a run script           

    set(_RunScript ${CMAKE_BINARY_DIR}/triton_run.sh)

    set(_RunScript ${CMAKE_BINARY_DIR}/triton_run.${SCRIPT_EXT})

    file(WRITE ${_RunScript}  "#!/usr/bin/env bash\n\n")

    file(APPEND ${_RunScript} "source ./${ENVFILE}\n\n")

    file(APPEND ${_RunScript} "CFG_FILE=\${1:-./input/paraboloid/paraboloid.cfg}\n")
@@ -71,7 +71,7 @@ endmacro() 


macro(add_test_script)

  # create a ctest script         

  set(_CtestScript ${CMAKE_BINARY_DIR}/triton_ctest.sh)

  set(_CtestScript ${CMAKE_BINARY_DIR}/triton_ctest.${SCRIPT_EXT})

  file(WRITE ${_CtestScript}  "#!/usr/bin/env bash\n\n")

  file(APPEND ${_CtestScript} "source ./${ENVFILE}\n\n")

  file(APPEND ${_CtestScript} "ctest $*\n\n")
@@ -83,7 +83,7 @@ macro(add_test_script) 
endmacro()



macro(add_clean_script)

  set(_CleanScript ${CMAKE_BINARY_DIR}/triton_clean.sh)

  set(_CleanScript ${CMAKE_BINARY_DIR}/triton_clean.${SCRIPT_EXT})

  file(WRITE ${_CleanScript}  "#!/usr/bin/env bash\n\n")

  file(APPEND ${_CleanScript} "rm -rf \\\n")

  file(APPEND ${_CleanScript} "    cid \\\n")
@@ -103,7 +103,7 @@ macro(add_clean_script) 
  file(APPEND ${_CleanScript} "    output_allatoona \\\n")

  file(APPEND ${_CleanScript} "    output_circular_dambreak \\\n")

  file(APPEND ${_CleanScript} "    output_paraboloid \\\n")

  file(APPEND ${_CleanScript} "    triton_ensrun.sh \\\n")

  file(APPEND ${_CleanScript} "    triton_ensrun.${SCRIPT_EXT} \\\n")

  file(APPEND ${_CleanScript} "    ensembles_ensify.yaml \\\n")

  file(APPEND ${_CleanScript} "    paraboloid_ens1.cfg \\\n")

  file(APPEND ${_CleanScript} "    paraboloid_ens2.cfg \\\n")

kokkos @ 92c1c233

Compare dc1bf738 to 92c1c233
Original line number Diff line number Diff line 
Subproject commit dc1bf738ea1a5676225c5592409af9d77a100a43
 
Subproject commit 92c1c2337a9f573d7622b0d9899dbe2c87e0118b