Merge remote-tracking branch 'origin/master' into main

7246044d · mibaumgartner · fcec502f · 6f4c3333 · 7246044d · 7246044d
Commit 7246044d authored Jun 01, 2021 by mibaumgartner
20 changed files
--- a/nndet/conf/train/deprecated/h0c05Deeplesion.yaml
+++ b/nndet/conf/train/deprecated/h0c05Deeplesion.yaml
--- a/nndet/conf/train/deprecated/h0c06.yaml
+++ b/nndet/conf/train/deprecated/h0c06.yaml
--- a/nndet/conf/train/deprecated/h0c06SWA.yaml
+++ b/nndet/conf/train/deprecated/h0c06SWA.yaml
--- a/nndet/conf/train/smoke.yaml
+++ b/nndet/conf/train/smoke.yaml
--- a/nndet/conf/train/v001.yaml
+++ b/nndet/conf/train/v001.yaml
--- a/nndet/core/__init__.py
+++ b/nndet/core/__init__.py
--- a/nndet/core/boxes/__init__.py
+++ b/nndet/core/boxes/__init__.py
--- a/nndet/core/boxes/anchors.py
+++ b/nndet/core/boxes/anchors.py
--- a/nndet/core/boxes/clip.py
+++ b/nndet/core/boxes/clip.py
--- a/nndet/core/boxes/coder.py
+++ b/nndet/core/boxes/coder.py
--- a/nndet/core/boxes/matcher.py
+++ b/nndet/core/boxes/matcher.py
--- a/nndet/core/boxes/nms.py
+++ b/nndet/core/boxes/nms.py
--- a/nndet/core/boxes/ops.py
+++ b/nndet/core/boxes/ops.py
--- a/nndet/core/boxes/ops_np.py
+++ b/nndet/core/boxes/ops_np.py
--- a/nndet/core/boxes/sampler.py
+++ b/nndet/core/boxes/sampler.py
--- a/nndet/core/retina.py
+++ b/nndet/core/retina.py
--- a/nndet/csrc/cpu/nms.cpp
+++ b/nndet/csrc/cpu/nms.cpp
--- a/nndet/csrc/cuda/cuda_helpers.h
+++ b/nndet/csrc/cuda/cuda_helpers.h
+#pragma once
+
+#define CUDA_1D_KERNEL_LOOP(i, n)                                \
+  for (int i = (blockIdx.x * blockDim.x) + threadIdx.x; i < (n); \
+       i += (blockDim.x * gridDim.x))
--- a/nndet/csrc/cuda/nms.cu
+++ b/nndet/csrc/cuda/nms.cu
--- a/nndet/csrc/ops.cpp
+++ b/nndet/csrc/ops.cpp