summaryrefslogtreecommitdiffstats
path: root/parallel-libs/streamexecutor/lib
diff options
context:
space:
mode:
authorJason Henline <jhen@google.com>2016-09-09 23:33:58 +0000
committerJason Henline <jhen@google.com>2016-09-09 23:33:58 +0000
commita3ad6dcfaf1ba5af42f19700c329dd27e3a62c40 (patch)
treeaa2363332f456b3047008f046a49a89b8f52b32a /parallel-libs/streamexecutor/lib
parent124384f08d4cb9b8c698951ed67fd6db79a15d15 (diff)
downloadbcm5719-llvm-a3ad6dcfaf1ba5af42f19700c329dd27e3a62c40.tar.gz
bcm5719-llvm-a3ad6dcfaf1ba5af42f19700c329dd27e3a62c40.zip
[SE] Remove Utils directory
Summary: There is no purpose in splitting out the Error class from the rest of the StreamExecutor code. This organization was just a vestige of an old failed design. Plus, this change fixes a bug in the build where the utilites library was not being statically linked in with libstreamexecutor. Reviewers: jlebar, jprice Subscribers: beanz, parallel_libs-commits Differential Revision: https://reviews.llvm.org/D24434 llvm-svn: 281118
Diffstat (limited to 'parallel-libs/streamexecutor/lib')
-rw-r--r--parallel-libs/streamexecutor/lib/CMakeLists.txt6
-rw-r--r--parallel-libs/streamexecutor/lib/Error.cpp (renamed from parallel-libs/streamexecutor/lib/Utils/Error.cpp)2
-rw-r--r--parallel-libs/streamexecutor/lib/Utils/CMakeLists.txt3
3 files changed, 2 insertions, 9 deletions
diff --git a/parallel-libs/streamexecutor/lib/CMakeLists.txt b/parallel-libs/streamexecutor/lib/CMakeLists.txt
index 11873c42390..be94cbabc46 100644
--- a/parallel-libs/streamexecutor/lib/CMakeLists.txt
+++ b/parallel-libs/streamexecutor/lib/CMakeLists.txt
@@ -3,12 +3,11 @@ macro(add_se_library name)
set_target_properties(${name} PROPERTIES FOLDER "streamexecutor libraries")
endmacro(add_se_library)
-add_subdirectory(Utils)
-
add_se_library(
streamexecutor
Device.cpp
DeviceMemory.cpp
+ Error.cpp
Kernel.cpp
KernelSpec.cpp
PackedKernelArgumentArray.cpp
@@ -16,9 +15,6 @@ add_se_library(
PlatformDevice.cpp
PlatformManager.cpp
Stream.cpp
-
- LINK_LIBS
- utils
)
install(TARGETS streamexecutor DESTINATION lib)
diff --git a/parallel-libs/streamexecutor/lib/Utils/Error.cpp b/parallel-libs/streamexecutor/lib/Error.cpp
index 15a9ccbed98..1f9d4a7834d 100644
--- a/parallel-libs/streamexecutor/lib/Utils/Error.cpp
+++ b/parallel-libs/streamexecutor/lib/Error.cpp
@@ -12,7 +12,7 @@
///
//===----------------------------------------------------------------------===//
-#include "streamexecutor/Utils/Error.h"
+#include "streamexecutor/Error.h"
#include "llvm/ADT/StringRef.h"
diff --git a/parallel-libs/streamexecutor/lib/Utils/CMakeLists.txt b/parallel-libs/streamexecutor/lib/Utils/CMakeLists.txt
deleted file mode 100644
index 2cbbc3b170f..00000000000
--- a/parallel-libs/streamexecutor/lib/Utils/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_se_library(
- utils
- Error.cpp)
OpenPOWER on IntegriCloud