Skip to content

Commit f420ca3

Browse files
committed
nix upd + O3 flag added + gui option rm
1 parent 4e61680 commit f420ca3

3 files changed

Lines changed: 6 additions & 14 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ set(pgen
4747
${default_pgen}
4848
CACHE STRING "Problem generator")
4949

50-
set(gui
51-
${default_gui}
52-
CACHE BOOL "Use GUI [nttiny]")
5350
set(output
5451
${default_output}
5552
CACHE BOOL "Enable output")
@@ -70,7 +67,7 @@ if(${DEBUG} STREQUAL "OFF")
7067
set(CMAKE_BUILD_TYPE
7168
Release
7269
CACHE STRING "CMake build type")
73-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
70+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG -O3")
7471
else()
7572
set(CMAKE_BUILD_TYPE
7673
Debug
@@ -177,11 +174,6 @@ elseif(BENCHMARK)
177174
# ------------------------------ Benchmark --------------------------------- #
178175
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/benchmark.cmake)
179176
else()
180-
# ----------------------------------- GUI ---------------------------------- #
181-
if(${gui})
182-
find_or_fetch_dependency(nttiny FALSE QUIET)
183-
endif()
184-
185177
# ------------------------------- Main source ------------------------------ #
186178
set_problem_generator(${pgen})
187179
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src src)

dev/nix/kokkos.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let
1010
pversion = "5.0.1";
1111
compilerPkgs = {
1212
"HIP" = with pkgs.rocmPackages; [
13-
llvm.llvm
13+
clang
1414
rocm-core
1515
clr
1616
rocthrust
@@ -41,7 +41,7 @@ let
4141
"-D Kokkos_ENABLE_HIP=ON"
4242
"-D Kokkos_ARCH_${getArch { }}=ON"
4343
"-D GPU_TARGETS=${builtins.replaceStrings [ "amd_" ] [ "" ] (pkgs.lib.toLower (getArch { }))}"
44-
"-D CMAKE_CXX_COMPILER=hipcc"
44+
"-D CMAKE_CXX_COMPILER=clang++"
4545
];
4646
"CUDA" = [
4747
"-D Kokkos_ENABLE_CUDA=ON"
@@ -57,7 +57,7 @@ pkgs.stdenv.mkDerivation rec {
5757
src = pkgs.fetchgit {
5858
url = "https://github.com/kokkos/kokkos/";
5959
rev = "${pversion}";
60-
sha256 = "sha256-C4DarqnEcdF3+19TPqcM0A9bcQSkKTJkB8b7OkzC7T8=";
60+
sha256 = "sha256-ChpwGBwE7sNovjdAM/iCeOqqwGufKxAh5vQ3qK6aFBU=";
6161
};
6262

6363
nativeBuildInputs = with pkgs; [

dev/nix/shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ let
2929
CC = "gcc";
3030
};
3131
HIP = {
32-
CXX = "hipcc";
33-
CC = "hipcc";
32+
CXX = "clang++";
33+
CC = "clang";
3434
};
3535
CUDA = { };
3636
};

0 commit comments

Comments
 (0)