fix some tests

Author: rainyl

lib/src/expr/op.dart

@@ -1373,23 +1373,23 @@ VARP reshape(VARP x, List<int> shape, {DimensionFormat format = DimensionFormat.
   return rval;
 }
 
-VARP scale(VARP x, int channels, List<double> scales, List<double> biases) {
-  final (scalesPtr, scalesSize) = scales.toNativeArrayF32();
-  final (biasesPtr, biasesSize) = biases.toNativeArrayF32();
-  final rval = VARP.fromPointer(
-    C.mnn_expr_Scale(
-      x.ptr,
-      channels,
-      scalesPtr.cast(),
-      scalesSize,
-      biasesPtr.cast(),
-      biasesSize,
-    ),
-  );
-  calloc.free(scalesPtr);
-  calloc.free(biasesPtr);
-  return rval;
-}
+// VARP scale(VARP x, int channels, List<double> scales, List<double> biases) {
+//   final (scalesPtr, scalesSize) = scales.toNativeArrayF32();
+//   final (biasesPtr, biasesSize) = biases.toNativeArrayF32();
+//   final rval = VARP.fromPointer(
+//     C.mnn_expr_Scale(
+//       x.ptr,
+//       channels,
+//       scalesPtr.cast(),
+//       scalesSize,
+//       biasesPtr.cast(),
+//       biasesSize,
+//     ),
+//   );
+//   calloc.free(scalesPtr);
+//   calloc.free(biasesPtr);
+//   return rval;
+// }
 
 /// Given an input value x, it computes the output as x if x > 0 and slope * x if x <= 0.
 ///
@@ -2091,11 +2091,12 @@ VARP GridSample(
 }) =>
     VARP.fromPointer(C.mnn_expr_GridSample(input.ptr, grid.ptr, mode.value, paddingMode.value, alignCorners));
 
-VARP floatToInt8(VARP x, VARP scale, int minvalue, int maxValue, {int? zeroPoint}) => VARP.fromPointer(
-  zeroPoint == null
-      ? C.mnn_expr_FloatToInt8(x.ptr, scale.ptr, minvalue, maxValue)
-      : C.mnn_expr_FloatToInt8_1(x.ptr, scale.ptr, minvalue, maxValue, zeroPoint),
-);
+VARP floatToInt8(VARP x, VARP scale, {int minvalue = -127, int maxValue = 127, int? zeroPoint}) =>
+    VARP.fromPointer(
+      zeroPoint == null
+          ? C.mnn_expr_FloatToInt8(x.ptr, scale.ptr, minvalue, maxValue)
+          : C.mnn_expr_FloatToInt8_1(x.ptr, scale.ptr, minvalue, maxValue, zeroPoint),
+    );
 
 VARP int8ToFloat(VARP x, VARP scale, {int? zeroPoint}) => VARP.fromPointer(
   zeroPoint == null

src/base.cpp

@@ -2,21 +2,3 @@
 // Created by rainy on 2025/9/15.
 //
 
-#include "base.h"
-#include <cstdlib>
-
-void *dart_malloc(size_t size) {
-#if WIN32
-  return CoTaskMemAlloc(size);
-#else
-  return malloc(size);
-#endif
-}
-
-void dart_free(void *ptr) {
-#if WIN32
-  return CoTaskMemFree(ptr);
-#else
-  return free(ptr);
-#endif
-}

src/base.h

@@ -17,10 +17,6 @@
 extern "C" {
 #endif
 
-MNN_C_API void *dart_malloc(size_t size);
-
-MNN_C_API void dart_free(void *ptr);
-
 #ifdef __cplusplus
 }
 #endif

src/expr.cpp

@@ -53,7 +53,7 @@ MNN_C_API VARMAP_t mnn_expr_VARMAP_create() {
 MNN_C_API void mnn_expr_VARMAP_free(void *self) { delete static_cast<VARMAP_t>(self); }
 MNN_C_API size_t mnn_expr_VARMAP_size(VARMAP_t self) { return self->size(); }
 MNN_C_API char **mnn_expr_VARMAP_keys(VARMAP_t self) {
-  char **keys = static_cast<char **>(dart_malloc(self->size() * sizeof(char *)));
+  char **keys = static_cast<char **>(malloc(self->size() * sizeof(char *)));
   int idx = 0;
   for (const auto &pair : *self) {
     keys[idx] = strdup(pair.first.c_str());
@@ -142,7 +142,7 @@ bool mnn_expr_VARP_copyToDevicePtr(VARP_t self, void *devicePtr, int memoryType)
 
 struct Variable_expr_pair *mnn_expr_VARP_getExpr(VARP_t self) {
   auto _expr = (*self)->expr();
-  auto pair = static_cast<Variable_expr_pair *>(dart_malloc(sizeof(Variable_expr_pair)));
+  auto pair = static_cast<Variable_expr_pair *>(malloc(sizeof(Variable_expr_pair)));
   pair->index = _expr.second;
   pair->expr = new MNN::Express::EXPRP{_expr.first};
   return pair;
@@ -262,10 +262,10 @@ int mnn_expr_Expr_inputType(EXPRP_t self) { return static_cast<int>(self->get()-
 
 struct mnn_expr_Variable_Info *mnn_expr_Expr_outputInfo(EXPRP_t self, int index) {
   auto _info = self->get()->outputInfo(index);
-  auto info = static_cast<mnn_expr_Variable_Info *>(dart_malloc(sizeof(mnn_expr_Variable_Info)));
+  auto info = new mnn_expr_Variable_Info();
   info->order = static_cast<int>(_info->order);
   info->ndim = _info->dim.size();
-  auto pdim = static_cast<int32_t *>(dart_malloc(info->ndim * sizeof(int32_t)));
+  auto pdim = new int32_t[info->ndim];
   for (int i = 0; i < info->ndim; i++) { pdim[i] = _info->dim[i]; }
   info->dim = pdim;
   info->type = {static_cast<uint8_t>(_info->type.code), _info->type.bits, _info->type.lanes};

test/autotime_test.dart

@@ -11,5 +11,6 @@ void main() async {
     final end = timer.current();
     final duration = end - start;
     expect(duration, greaterThan(0));
+    timer.dispose();
   });
 }

test/expr/VARP_test.dart

@@ -4,6 +4,8 @@ import 'package:mnn/mnn.dart' as mnn;
 import 'package:mnn/numpy.dart' as np;
 import 'package:test/test.dart';
 
+import '../list_element_equals.dart';
+
 void main() {
   group('VARP creation', () {
     test('VARP.create', () {
@@ -266,12 +268,13 @@ void main() {
     test('mean, sum instance methods', () {
       final data = [1.0, 2.0, 3.0, 4.0];
       final x = mnn.VARP.listND<mnn.float32>(data, [2, 2]);
+      expect(x.data, listCloseTo([1.0, 2.0, 3.0, 4.0], 0.001));
 
       final m = x.mean([0]); // [2, 3]
-      expect(m.data, [2.0, 3.0]);
+      expect(m.data, listCloseTo([2.0, 3.0], 0.001));
 
       final s = x.sum([1]); // [3, 7]
-      expect(s.data, [3.0, 7.0]);
+      expect(s.data, listCloseTo([3.0, 7.0], 0.001));
 
       x.dispose();
       m.dispose();