cleanup top-level packages

rapidsai · ajit283 · Jun 14, 2024 · Jun 14, 2024 · Jun 19, 2024 · Jun 19, 2024
commit e05782a576df2dd951c5d82e104a669658301339
diff --git a/.gitignore b/.gitignore
@@ -79,8 +79,6 @@ cagra_index
 ivf_flat_index
 ivf_pq_index
 
-.aider*
-
 # cuvs_bench
 datasets/
 /*.json
diff --git a/go/.gitignore b/go/.gitignore
diff --git a/go/brute_force/brute_force_test.go b/go/brute_force/brute_force_test.go
@@ -2,15 +2,13 @@ package brute_force
 
 import (
 	"math/rand"
-
-	cuvs "github.com/rapidsai/cuvs/go"
-
 	"testing"
 	"time"
+
+	cuvs "github.com/rapidsai/cuvs/go"
 )
 
 func TestBruteForce(t *testing.T) {
-
 	resource, _ := cuvs.NewResource(nil)
 
 	rand.Seed(time.Now().UnixNano())
@@ -26,7 +24,7 @@ func TestBruteForce(t *testing.T) {
 		}
 	}
 
-	dataset, _ := cuvs.NewTensor(true, TestDataset)
+	dataset, _ := cuvs.NewTensor(TestDataset)
 
 	index, _ := CreateIndex()
 	defer index.Close()
@@ -35,7 +33,7 @@ func TestBruteForce(t *testing.T) {
 
 	NQueries := 4
 	K := 4
-	queries, _ := cuvs.NewTensor(true, TestDataset[:NQueries])
+	queries, _ := cuvs.NewTensor(TestDataset[:NQueries])
 	NeighborsDataset := make([][]int64, NQueries)
 	for i := range NeighborsDataset {
 		NeighborsDataset[i] = make([]int64, K)
@@ -44,8 +42,8 @@ func TestBruteForce(t *testing.T) {
 	for i := range DistancesDataset {
 		DistancesDataset[i] = make([]float32, K)
 	}
-	neighbors, _ := cuvs.NewTensor(true, NeighborsDataset)
-	distances, _ := cuvs.NewTensor(true, DistancesDataset)
+	neighbors, _ := cuvs.NewTensor(NeighborsDataset)
+	distances, _ := cuvs.NewTensor(DistancesDataset)
 
 	_, todeviceerr := neighbors.ToDevice(&resource)
 	if todeviceerr != nil {
@@ -66,20 +64,19 @@ func TestBruteForce(t *testing.T) {
 
 	resource.Sync()
 
-	arr, _ := neighbors.GetArray()
+	arr, _ := neighbors.Slice()
 	for i := range arr {
 		println(arr[i][0])
 		if arr[i][0] != int64(i) {
 			t.Error("wrong neighbor, expected", i, "got", arr[i][0])
 		}
 	}
 
-	arr_dist, _ := distances.GetArray()
+	arr_dist, _ := distances.Slice()
 	for i := range arr_dist {
 		println(arr_dist[i][0])
 		if arr_dist[i][0] >= float32(0.001) || arr_dist[i][0] <= float32(-0.001) {
 			t.Error("wrong distance, expected", float32(i), "got", arr_dist[i][0])
 		}
 	}
-
 }
diff --git a/go/brute_force/mytests b/go/brute_force/mytests
diff --git a/go/cagra/cagra_test.go b/go/cagra/cagra_test.go
@@ -9,7 +9,6 @@ import (
 )
 
 func TestCagra(t *testing.T) {
-
 	resource, _ := cuvs.NewResource(nil)
 
 	rand.Seed(time.Now().UnixNano())
@@ -42,21 +41,19 @@ func TestCagra(t *testing.T) {
 		// }
 	}
 
-	dataset, _ := cuvs.NewTensor(true, TestDataset)
+	dataset, _ := cuvs.NewTensor(TestDataset)
 	defer dataset.Close()
 
-	extend_dataset, _ := cuvs.NewTensor(true, ExtendDataset)
+	extend_dataset, _ := cuvs.NewTensor(ExtendDataset)
 	defer extend_dataset.Close()
 
-	extend_return_dataset, _ := cuvs.NewTensor(true, ExtendReturnEmptyDataset)
+	extend_return_dataset, _ := cuvs.NewTensor(ExtendReturnEmptyDataset)
 	defer extend_return_dataset.Close()
 
 	// CompressionParams, _ := CreateCompressionParams()
 
 	IndexParams, err := CreateIndexParams()
-
 	// IndexParams.SetCompression(CompressionParams)
-
 	if err != nil {
 		panic(err)
 	}
@@ -68,7 +65,7 @@ func TestCagra(t *testing.T) {
 
 	NQueries := 4
 	K := 10
-	queries, _ := cuvs.NewTensor(true, TestDataset[:NQueries])
+	queries, _ := cuvs.NewTensor(TestDataset[:NQueries])
 	NeighborsDataset := make([][]uint32, NQueries)
 	for i := range NeighborsDataset {
 		NeighborsDataset[i] = make([]uint32, K)
@@ -77,8 +74,8 @@ func TestCagra(t *testing.T) {
 	for i := range DistancesDataset {
 		DistancesDataset[i] = make([]float32, K)
 	}
-	neighbors, _ := cuvs.NewTensor(true, NeighborsDataset)
-	distances, _ := cuvs.NewTensor(true, DistancesDataset)
+	neighbors, _ := cuvs.NewTensor(NeighborsDataset)
+	distances, _ := cuvs.NewTensor(DistancesDataset)
 	println("hello")
 
 	_, todeviceerr := neighbors.ToDevice(&resource)
@@ -111,7 +108,6 @@ func TestCagra(t *testing.T) {
 	queries.ToDevice(&resource)
 
 	SearchParams, err := CreateSearchParams()
-
 	if err != nil {
 		panic(err)
 	}
@@ -130,7 +126,7 @@ func TestCagra(t *testing.T) {
 	// arr_extend_return_dataset, _ := extend_return_dataset.GetArray()
 
 	// p := (*int64)(unsafe.Pointer(uintptr(neighbors.c_tensor.dl_tensor.data) + uintptr(K*8*3)))
-	arr, _ := neighbors.GetArray()
+	arr, _ := neighbors.Slice()
 	for i := range arr {
 		println(arr[i][0])
 		if arr[i][0] != uint32(i) {
@@ -144,5 +140,4 @@ func TestCagra(t *testing.T) {
 	// 		t.Error("wrong distance, expected", float32(i), "got", arr_dist[i][0])
 	// 	}
 	// }
-
 }
diff --git a/go/distance.go b/go/distance.go
@@ -1,16 +1,8 @@
 package cuvs
 
-// #include <stdio.h>
-// #include <stdlib.h>
-// #include <dlpack/dlpack.h>
-// #include <cuda_runtime_api.h>
-// #include <cuvs/core/c_api.h>
 // #include <cuvs/distance/pairwise_distance.h>
-// #include <cuvs/neighbors/brute_force.h>
-// #include <cuvs/neighbors/ivf_flat.h>
-// #include <cuvs/neighbors/cagra.h>
-// #include <cuvs/neighbors/ivf_pq.h>
 import "C"
+
 import (
 	"errors"
 	"unsafe"
@@ -65,13 +57,11 @@ var CDistances = map[Distance]int{
 }
 
 func PairwiseDistance[T any](Resources Resource, x *Tensor[T], y *Tensor[T], distances *Tensor[float32], metric Distance, metric_arg float32) error {
-
 	CMetric, exists := CDistances[metric]
 
 	if !exists {
 		return errors.New("cuvs: invalid distance metric")
 	}
 
 	return CheckCuvs(CuvsError(C.cuvsPairwiseDistance(C.cuvsResources_t(Resources.Resource), (*C.DLManagedTensor)(unsafe.Pointer(x.C_tensor)), (*C.DLManagedTensor)(unsafe.Pointer(y.C_tensor)), (*C.DLManagedTensor)(unsafe.Pointer(distances.C_tensor)), C.cuvsDistanceType(CMetric), C.float(metric_arg))))
-
 }
diff --git a/go/distance_test.go b/go/distance_test.go
@@ -24,14 +24,14 @@ func TestDistance(t *testing.T) {
 		}
 	}
 
-	dataset, _ := cuvs.NewTensor(true, TestDataset)
+	dataset, _ := cuvs.NewTensor(TestDataset)
 
 	DistancesDataset := make([][]float32, NDataPoints)
 	for i := range DistancesDataset {
 		DistancesDataset[i] = make([]float32, NDataPoints)
 	}
 
-	distances, _ := cuvs.NewTensor(true, DistancesDataset)
+	distances, _ := cuvs.NewTensor(DistancesDataset)
 
 	distances.ToDevice(&resource)
 	dataset.ToDevice(&resource)
@@ -42,9 +42,8 @@ func TestDistance(t *testing.T) {
 
 	resource.Sync()
 
-	arr, _ := distances.GetArray()
+	arr, _ := distances.Slice()
 	if arr[0][0] != 0.0 {
 		t.Error("wrong distance, expected", 0.0, "got", arr[0][0])
 	}
-
 }