Replace !defined by ifndef for consistency

rapidsai · Apr 27, 2023 · 7af7711 · 7af7711
1 parent eca9128
commit 7af7711
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 25 deletions.
diff --git a/cpp/include/raft/distance/detail/pairwise_matrix/dispatch.cuh b/cpp/include/raft/distance/detail/pairwise_matrix/dispatch.cuh
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "dispatch-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/distance/distance.cuh b/cpp/include/raft/distance/distance.cuh
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "distance-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/distance/fused_l2_nn.cuh b/cpp/include/raft/distance/fused_l2_nn.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "fused_l2_nn-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/matrix/detail/select_k.cuh b/cpp/include/raft/matrix/detail/select_k.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "select_k-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/ball_cover.cuh b/cpp/include/raft/neighbors/ball_cover.cuh
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "ball_cover-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/brute_force.cuh b/cpp/include/raft/neighbors/brute_force.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "brute_force-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/detail/ivf_flat_search.cuh b/cpp/include/raft/neighbors/detail/ivf_flat_search.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "ivf_flat_search-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/detail/selection_faiss.cuh b/cpp/include/raft/neighbors/detail/selection_faiss.cuh
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "selection_faiss-inl.cuh"
 #endif
 
-#if defined(RAFT_COMPILED)
+#ifdef RAFT_COMPILED
 #include "selection_faiss-ext.cuh"
 #endif
diff --git a/cpp/include/raft/neighbors/ivf_flat.cuh b/cpp/include/raft/neighbors/ivf_flat.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "ivf_flat-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/ivf_pq.cuh b/cpp/include/raft/neighbors/ivf_pq.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "ivf_pq-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/neighbors/refine.cuh b/cpp/include/raft/neighbors/refine.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "refine-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/spatial/knn/detail/ball_cover/registers.cuh b/cpp/include/raft/spatial/knn/detail/ball_cover/registers.cuh
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "registers-inl.cuh"
 #endif
 

diff --git a/cpp/include/raft/spatial/knn/detail/fused_l2_knn.cuh b/cpp/include/raft/spatial/knn/detail/fused_l2_knn.cuh
@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 #include "fused_l2_knn-inl.cuh"
 #endif
 
-#if defined(RAFT_COMPILED)
+#ifdef RAFT_COMPILED
 #include "fused_l2_knn-ext.cuh"
 #endif
diff --git a/docs/source/developer_guide.md b/docs/source/developer_guide.md
@@ -321,7 +321,7 @@ Below, we summarize which combinations of `RAFT_COMPILED` and `RAFT_EXPLICIT_INS
 
 The dispatching by `expensive.cuh` is performed as follows:
 ``` c++
-#if !defined(RAFT_EXPLICIT_INSTANTIATE_ONLY)
+#ifndef RAFT_EXPLICIT_INSTANTIATE_ONLY
 // If implicit instantiation is allowed, include template definitions.
 #include "expensive-inl.cuh"
 #endif