Merge pull request #6388 from ejparkqc:master

PiperOrigin-RevId: 634268380
google · May 16, 2024 · 7fabcac · 7fabcac
2 parents cc1a3a7 + 21dbb8b
commit 7fabcac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/scripts/build-qurt-v68.sh b/scripts/build-qurt-v68.sh
@@ -22,6 +22,7 @@ fi
 CMAKE_ARGS+=("-DXNNPACK_BUILD_LIBRARY=ON")
 CMAKE_ARGS+=("-DXNNPACK_BUILD_BENCHMARKS=ON")
 CMAKE_ARGS+=("-DXNNPACK_BUILD_TESTS=ON")
+CMAKE_ARGS+=("-DXNNPACK_ENABLE_RISCV_VECTOR=OFF")
 
 # Cross-compilation options for Google Benchmark
 CMAKE_ARGS+=("-DHAVE_STEADY_CLOCK=0")

diff --git a/test/deconvolution-operator-tester.h b/test/deconvolution-operator-tester.h
@@ -1148,7 +1148,7 @@ class DeconvolutionOperatorTester {
       for (size_t g = 0; g < groups(); g++) {
         for (size_t oc = 0; oc < group_output_channels(); oc++) {
           int32_t range = w8dist(rng);
-          auto weights_dist = std::uniform_int_distribution<int32_t>(std::min(range, 0), std::max(range, 0));
+          auto weights_dist = std::uniform_int_distribution<int32_t>(std::min<int32_t>(range, 0), std::max<int32_t>(range, 0));
           bias[g * group_output_channels() + oc] = f32dist(rng);
           for (size_t y = 0; y < kernel_height(); y++) {
             for (size_t x = 0; x < kernel_width(); x++) {