Skip to content

Commit 78c20ef

Browse files
committed
Remove fork of cub, in favor of system distribution.
1 parent d17a151 commit 78c20ef

File tree

130 files changed

+74
-38671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+74
-38671
lines changed

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ git_repository(
1919

2020
http_archive(
2121
name = "sqlite3",
22-
sha256 = "87775784f8b22d0d0f1d7811870d39feaa7896319c7c20b849a4181c5a50609b",
23-
urls = ["https://www.sqlite.org/2022/sqlite-amalgamation-3390200.zip"],
22+
sha256 = "9da21e6b14ef6a943cdc30f973df259fb390bb4483f77e7f171b9b6e977e5458",
23+
urls = ["https://www.sqlite.org/2022/sqlite-amalgamation-3470100.zip"],
2424
build_file = "sqlite3.BUILD"
2525
)
2626

lib/BUILD.bazel

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -428,31 +428,6 @@ objc_library(
428428
]
429429
)
430430

431-
cuda_library(
432-
name = "thrust_headers",
433-
hdrs = glob(["nnc/gpu/3rdparty/thrust/**/*.h", "nnc/gpu/3rdparty/thrust/**/*.inl"]),
434-
includes = [
435-
"nnc/gpu"
436-
],
437-
copts = ccv_default_copts(),
438-
deps = [
439-
"@local_config_ccv//config:cuda_deps"
440-
]
441-
)
442-
443-
cuda_library(
444-
name = "cub_headers",
445-
hdrs = glob(["nnc/gpu/3rdparty/cub/**/*.h", "nnc/gpu/3rdparty/cub/**/*.inl"]),
446-
includes = [
447-
"nnc/gpu"
448-
],
449-
copts = ccv_default_copts(),
450-
deps = [
451-
"@local_config_ccv//config:cuda_deps",
452-
":thrust_headers"
453-
]
454-
)
455-
456431
cuda_library(
457432
name = "cmd_cuda",
458433
srcs = glob(["nnc/cmd/**/*.h"]) + glob(["nnc/cmd/**/*.cu"]),
@@ -470,8 +445,7 @@ cuda_library(
470445
copts = ccv_default_copts(),
471446
deps = [
472447
":nnc_headers",
473-
":nnc_cuda_compat",
474-
":cub_headers"
448+
":nnc_cuda_compat"
475449
] + select({
476450
"//config:have_cuda_sm80": [
477451
":nnc_cuda_compat_sm80"

lib/nnc/cmd/argsort/gpu/ccv_nnc_argsort_gpu_ref.cu

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,10 @@ extern "C" {
99

1010
#ifdef HAVE_CUDA
1111

12-
#ifdef USE_SYSTEM_CUB
1312
#include <cub/util_type.cuh>
1413
#include <cub/device/device_radix_sort.cuh>
1514
#include <cub/thread/thread_load.cuh>
1615
#include <cub/thread/thread_store.cuh>
17-
#else
18-
#include "3rdparty/cub/util_type.cuh.h"
19-
#include "3rdparty/cub/device/device_radix_sort.cuh.h"
20-
#include "3rdparty/cub/thread/thread_load.cuh.h"
21-
#include "3rdparty/cub/thread/thread_store.cuh.h"
22-
#endif
2316

2417
__global__ void _ccv_nnc_arange(const int n, int* const indices)
2518
{

lib/nnc/cmd/nms/gpu/ccv_nnc_nms_gpu_ref.cu

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,10 @@ extern "C" {
99

1010
#ifdef HAVE_CUDA
1111

12-
#ifdef USE_SYSTEM_CUB
1312
#include <cub/util_type.cuh>
1413
#include <cub/device/device_radix_sort.cuh>
1514
#include <cub/thread/thread_load.cuh>
1615
#include <cub/thread/thread_store.cuh>
17-
#else
18-
#include "3rdparty/cub/util_type.cuh.h"
19-
#include "3rdparty/cub/device/device_radix_sort.cuh.h"
20-
#include "3rdparty/cub/thread/thread_load.cuh.h"
21-
#include "3rdparty/cub/thread/thread_store.cuh.h"
22-
#endif
2316

2417
struct float5 {
2518
float v[5];

0 commit comments

Comments
 (0)