Update to version 4.0.1.

mlpack · Dec 29, 2022 · 509c128 · 509c128
1 parent 3463caa
commit 509c128
Show file tree

Hide file tree

Showing 50 changed files with 80 additions and 1,118 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 .PHONY: test deps download build clean docker
 
 # mlpack version to use.
-MLPACK_VERSION?=4.0.0
+MLPACK_VERSION?=4.0.1
 
 # armadillo version to use.
 ARMA_VERSION?=9.800.1

diff --git a/adaboost.go b/adaboost.go
@@ -136,7 +136,7 @@ func Adaboost(param *AdaboostOptionalParam) (*mat.Dense, adaBoostModel, *mat.Den
 
   // Detect if the parameter was passed; set if so.
   if param.Test != nil {
-    gonumToArmaMat(params, "test", param.Test)
+    gonumToArmaMat(params, "test", param.Test, false)
     setPassed(params, "test")
   }
 
@@ -148,7 +148,7 @@ func Adaboost(param *AdaboostOptionalParam) (*mat.Dense, adaBoostModel, *mat.Den
 
   // Detect if the parameter was passed; set if so.
   if param.Training != nil {
-    gonumToArmaMat(params, "training", param.Training)
+    gonumToArmaMat(params, "training", param.Training, false)
     setPassed(params, "training")
   }
 

diff --git a/approx_kfn.go b/approx_kfn.go
@@ -158,7 +158,7 @@ func ApproxKfn(param *ApproxKfnOptionalParam) (*mat.Dense, *mat.Dense, approxkfn
 
   // Detect if the parameter was passed; set if so.
   if param.ExactDistances != nil {
-    gonumToArmaMat(params, "exact_distances", param.ExactDistances)
+    gonumToArmaMat(params, "exact_distances", param.ExactDistances, false)
     setPassed(params, "exact_distances")
   }
 
@@ -188,13 +188,13 @@ func ApproxKfn(param *ApproxKfnOptionalParam) (*mat.Dense, *mat.Dense, approxkfn
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 

diff --git a/arma_util.go b/arma_util.go
@@ -91,7 +91,7 @@ func (m *mlpackArma) allocArmaPtrMatWithInfo(p *params,
 }
 
 // Passes a Gonum matrix to C by using the underlying data from the Gonum matrix.
-func gonumToArmaMat(p *params, identifier string, m *mat.Dense) {
+func gonumToArmaMat(p *params, identifier string, m *mat.Dense, trans bool) {
   // Get the number of elements in the Armadillo column.
   r, c := m.Dims()
   blas64General := m.RawMatrix()
@@ -100,7 +100,7 @@ func gonumToArmaMat(p *params, identifier string, m *mat.Dense) {
   // Pass pointer of the underlying matrix to mlpack.
   ptr := unsafe.Pointer(&data[0])
   C.mlpackToArmaMat(p.mem, C.CString(identifier), (*C.double)(ptr),
-      C.size_t(c), C.size_t(r))
+      C.size_t(c), C.size_t(r), C.bool(trans))
 }
 
 // Passes a Gonum matrix to C by using the underlying data from the Gonum matrix.

diff --git a/bayesian_linear_regression.go b/bayesian_linear_regression.go
@@ -132,7 +132,7 @@ func BayesianLinearRegression(param *BayesianLinearRegressionOptionalParam) (bay
 
   // Detect if the parameter was passed; set if so.
   if param.Input != nil {
-    gonumToArmaMat(params, "input", param.Input)
+    gonumToArmaMat(params, "input", param.Input, false)
     setPassed(params, "input")
   }
 
@@ -156,7 +156,7 @@ func BayesianLinearRegression(param *BayesianLinearRegressionOptionalParam) (bay
 
   // Detect if the parameter was passed; set if so.
   if param.Test != nil {
-    gonumToArmaMat(params, "test", param.Test)
+    gonumToArmaMat(params, "test", param.Test, false)
     setPassed(params, "test")
   }
 

diff --git a/capi/arma_util.h b/capi/arma_util.h
@@ -28,7 +28,8 @@ void mlpackToArmaMat(void* params,
                      const char* identifier,
                      double* mat,
                      const size_t row,
-                     const size_t col);
+                     const size_t col,
+                     bool transpose);
 
 /**
  * Pass Gonum Dense pointer and wrap an Armadillo mat around it.

diff --git a/capi/test_go_binding.h b/capi/test_go_binding.h
diff --git a/cf.go b/cf.go
@@ -264,13 +264,13 @@ func Cf(param *CfOptionalParam) (*mat.Dense, cfModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Test != nil {
-    gonumToArmaMat(params, "test", param.Test)
+    gonumToArmaMat(params, "test", param.Test, false)
     setPassed(params, "test")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Training != nil {
-    gonumToArmaMat(params, "training", param.Training)
+    gonumToArmaMat(params, "training", param.Training, false)
     setPassed(params, "training")
   }
 

diff --git a/dbscan.go b/dbscan.go
@@ -95,7 +95,7 @@ func Dbscan(input *mat.Dense, param *DbscanOptionalParam) (*mat.Dense, *mat.Dens
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/decision_tree.go b/decision_tree.go
@@ -198,7 +198,7 @@ func DecisionTree(param *DecisionTreeOptionalParam) (decisionTreeModel, *mat.Den
 
   // Detect if the parameter was passed; set if so.
   if param.Weights != nil {
-    gonumToArmaMat(params, "weights", param.Weights)
+    gonumToArmaMat(params, "weights", param.Weights, false)
     setPassed(params, "weights")
   }
 

diff --git a/det.go b/det.go
@@ -141,13 +141,13 @@ func Det(param *DetOptionalParam) (dTree, string, string, *mat.Dense, *mat.Dense
 
   // Detect if the parameter was passed; set if so.
   if param.Test != nil {
-    gonumToArmaMat(params, "test", param.Test)
+    gonumToArmaMat(params, "test", param.Test, false)
     setPassed(params, "test")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Training != nil {
-    gonumToArmaMat(params, "training", param.Training)
+    gonumToArmaMat(params, "training", param.Training, false)
     setPassed(params, "training")
   }
 

diff --git a/emst.go b/emst.go
@@ -75,7 +75,7 @@ func Emst(input *mat.Dense, param *EmstOptionalParam) (*mat.Dense) {
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/fastmks.go b/fastmks.go
@@ -162,13 +162,13 @@ func Fastmks(param *FastmksOptionalParam) (*mat.Dense, *mat.Dense, fastmksModel)
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 

diff --git a/gmm_probability.go b/gmm_probability.go
@@ -54,7 +54,7 @@ func GmmProbability(input *mat.Dense, inputModel *gmm, param *GmmProbabilityOpti
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/gmm_train.go b/gmm_train.go
@@ -149,7 +149,7 @@ func GmmTrain(gaussians int, input *mat.Dense, param *GmmTrainOptionalParam) (gm
   setPassed(params, "gaussians")
 
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/hmm_loglik.go b/hmm_loglik.go
@@ -54,7 +54,7 @@ func HmmLoglik(input *mat.Dense, inputModel *hmmModel, param *HmmLoglikOptionalP
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/hmm_viterbi.go b/hmm_viterbi.go
@@ -54,7 +54,7 @@ func HmmViterbi(input *mat.Dense, inputModel *hmmModel, param *HmmViterbiOptiona
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/image_converter.go b/image_converter.go
@@ -101,7 +101,7 @@ func ImageConverter(input []string, param *ImageConverterOptionalParam) (*mat.De
 
   // Detect if the parameter was passed; set if so.
   if param.Dataset != nil {
-    gonumToArmaMat(params, "dataset", param.Dataset)
+    gonumToArmaMat(params, "dataset", param.Dataset, false)
     setPassed(params, "dataset")
   }
 

diff --git a/kde.go b/kde.go
@@ -241,13 +241,13 @@ func Kde(param *KdeOptionalParam) (kdeModel, *mat.Dense) {
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 

diff --git a/kernel_pca.go b/kernel_pca.go
@@ -121,7 +121,7 @@ func KernelPca(input *mat.Dense, kernel string, param *KernelPcaOptionalParam) (
   disableBacktrace()
   disableVerbose()
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.

diff --git a/kfn.go b/kfn.go
@@ -153,7 +153,7 @@ func Kfn(param *KfnOptionalParam) (*mat.Dense, *mat.Dense, kfnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
@@ -165,7 +165,7 @@ func Kfn(param *KfnOptionalParam) (*mat.Dense, *mat.Dense, kfnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 
@@ -183,7 +183,7 @@ func Kfn(param *KfnOptionalParam) (*mat.Dense, *mat.Dense, kfnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.TrueDistances != nil {
-    gonumToArmaMat(params, "true_distances", param.TrueDistances)
+    gonumToArmaMat(params, "true_distances", param.TrueDistances, false)
     setPassed(params, "true_distances")
   }
 

diff --git a/kmeans.go b/kmeans.go
@@ -156,7 +156,7 @@ func Kmeans(clusters int, input *mat.Dense, param *KmeansOptionalParam) (*mat.De
   setPassed(params, "clusters")
 
   // Detect if the parameter was passed; set if so.
-  gonumToArmaMat(params, "input", input)
+  gonumToArmaMat(params, "input", input, false)
   setPassed(params, "input")
 
   // Detect if the parameter was passed; set if so.
@@ -179,7 +179,7 @@ func Kmeans(clusters int, input *mat.Dense, param *KmeansOptionalParam) (*mat.De
 
   // Detect if the parameter was passed; set if so.
   if param.InitialCentroids != nil {
-    gonumToArmaMat(params, "initial_centroids", param.InitialCentroids)
+    gonumToArmaMat(params, "initial_centroids", param.InitialCentroids, false)
     setPassed(params, "initial_centroids")
   }
 

diff --git a/knn.go b/knn.go
@@ -150,7 +150,7 @@ func Knn(param *KnnOptionalParam) (*mat.Dense, *mat.Dense, knnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
@@ -162,7 +162,7 @@ func Knn(param *KnnOptionalParam) (*mat.Dense, *mat.Dense, knnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 
@@ -192,7 +192,7 @@ func Knn(param *KnnOptionalParam) (*mat.Dense, *mat.Dense, knnModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.TrueDistances != nil {
-    gonumToArmaMat(params, "true_distances", param.TrueDistances)
+    gonumToArmaMat(params, "true_distances", param.TrueDistances, false)
     setPassed(params, "true_distances")
   }
 

diff --git a/krann.go b/krann.go
@@ -164,7 +164,7 @@ func Krann(param *KrannOptionalParam) (*mat.Dense, *mat.Dense, raModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Query != nil {
-    gonumToArmaMat(params, "query", param.Query)
+    gonumToArmaMat(params, "query", param.Query, false)
     setPassed(params, "query")
   }
 
@@ -176,7 +176,7 @@ func Krann(param *KrannOptionalParam) (*mat.Dense, *mat.Dense, raModel) {
 
   // Detect if the parameter was passed; set if so.
   if param.Reference != nil {
-    gonumToArmaMat(params, "reference", param.Reference)
+    gonumToArmaMat(params, "reference", param.Reference, false)
     setPassed(params, "reference")
   }
 

diff --git a/lars.go b/lars.go
@@ -126,7 +126,7 @@ func Lars(param *LarsOptionalParam) (lars, *mat.Dense) {
   disableVerbose()
   // Detect if the parameter was passed; set if so.
   if param.Input != nil {
-    gonumToArmaMat(params, "input", param.Input)
+    gonumToArmaMat(params, "input", param.Input, true)
     setPassed(params, "input")
   }
 
@@ -150,13 +150,13 @@ func Lars(param *LarsOptionalParam) (lars, *mat.Dense) {
 
   // Detect if the parameter was passed; set if so.
   if param.Responses != nil {
-    gonumToArmaMat(params, "responses", param.Responses)
+    gonumToArmaMat(params, "responses", param.Responses, false)
     setPassed(params, "responses")
   }
 
   // Detect if the parameter was passed; set if so.
   if param.Test != nil {
-    gonumToArmaMat(params, "test", param.Test)
+    gonumToArmaMat(params, "test", param.Test, true)
     setPassed(params, "test")
   }