Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88f0b99e4776
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5d131d332680
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 9, 2020

  1. clpeak: fix build 

    The build of clpeak recently started failing because opencl-clhpp was
updated. The latest version of opencl-hpp does not ship the deprecated
cl.hpp header anymore.
    @danieldk
    danieldk committed Sep 9, 2020
    Copy the full SHA
    5f67382 View commit details

  2. Merge pull request #97540 from danieldk/fix-clpeak 

    clpeak: fix build
    @worldofpeace
    worldofpeace authored Sep 9, 2020
    Copy the full SHA
    5d131d3 View commit details
Showing with 80 additions and 0 deletions.
  1. +72 −0 pkgs/tools/misc/clpeak/clpeak-clhpp2.diff
  2. +8 −0 pkgs/tools/misc/clpeak/default.nix
72 changes: 72 additions & 0 deletions pkgs/tools/misc/clpeak/clpeak-clhpp2.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86fec9e..b9d0341 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ elseif(WIN32 AND ${OpenCL_LIBRARIES} MATCHES "OpenCL.lib")
set(OpenCL_LIBRARIES ${OpenCL_LIBRARIES} cfgmgr32.lib)
endif()

-FIND_PATH(HPP_FOUND CL/cl.hpp PATHS ${OpenCL_INCLUDE_DIRS})
+FIND_PATH(HPP_FOUND CL/cl2.hpp PATHS ${OpenCL_INCLUDE_DIRS})
if(NOT HPP_FOUND)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(BuildCLHpp)
diff --git a/include/clpeak.h b/include/clpeak.h
index c090d31..0d9d5e2 100644
--- a/include/clpeak.h
+++ b/include/clpeak.h
@@ -1,14 +1,10 @@
#ifndef CLPEAK_HPP
#define CLPEAK_HPP

-#define __CL_ENABLE_EXCEPTIONS
-
-#include <CL/cl.hpp>
-
#include <iostream>
#include <stdio.h>
#include <iomanip>
-#include <string.h>
+#include <string>
#include <sstream>
#include <common.h>
#include <logger.h>
diff --git a/include/common.h b/include/common.h
index 91318cb..6aaca04 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,7 +1,11 @@
#ifndef COMMON_H
#define COMMON_H

-#include <CL/cl.hpp>
+#define CL_HPP_ENABLE_EXCEPTIONS
+#define CL_HPP_MINIMUM_OPENCL_VERSION 120
+#define CL_HPP_TARGET_OPENCL_VERSION 120
+#include <CL/cl2.hpp>
+
#if defined(__APPLE__) || defined(__MACOSX) || defined(__FreeBSD__)
#include <sys/types.h>
#endif
diff --git a/src/clpeak.cpp b/src/clpeak.cpp
index 8708463..4a47842 100644
--- a/src/clpeak.cpp
+++ b/src/clpeak.cpp
@@ -3,7 +3,7 @@

#define MSTRINGIFY(...) #__VA_ARGS__

-static const char *stringifiedKernels =
+static const std::string stringifiedKernels =
#include "global_bandwidth_kernels.cl"
#include "compute_sp_kernels.cl"
#include "compute_hp_kernels.cl"
@@ -65,7 +65,7 @@ int clPeak::runAll()

cl::Context ctx(CL_DEVICE_TYPE_ALL, cps);
vector<cl::Device> devices = ctx.getInfo<CL_CONTEXT_DEVICES>();
- cl::Program::Sources source(1, make_pair(stringifiedKernels, (strlen(stringifiedKernels) + 1)));
+ cl::Program::Sources source(1, stringifiedKernels);
cl::Program prog = cl::Program(ctx, source);

for (size_t d = 0; d < devices.size(); d++)
8 changes: 8 additions & 0 deletions pkgs/tools/misc/clpeak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2";
};

patches = [
# The cl.hpp header was removed from opencl-clhpp. This patch
# updates clpeak to use the new cp2.hpp header. The patch comes
# from the following PR and was updated to apply against more
# recent versions: https://github.com/krrishnarraj/clpeak/pull/46
./clpeak-clhpp2.diff
];

nativeBuildInputs = [ cmake ];

buildInputs = [ ocl-icd opencl-clhpp ];