finish reverting the nofvm logic

Author: snadrus

cgo/fvm.go

@@ -1,4 +1,4 @@
-//go:build fvm
+//go:build !nofvm
 
 package cgo
 

cgo/types_fvm.go

@@ -1,4 +1,4 @@
-//go:build fvm
+//go:build !nofvm
 
 package cgo
 

fvm.go

@@ -1,7 +1,7 @@
-//go:build cgo && (amd64 || arm64 || riscv64) && fvm
+//go:build cgo && (amd64 || arm64 || riscv64) && !nofvm
 // +build cgo
 // +build amd64 arm64 riscv64
-// +build fvm
+// +build !nofvm
 
 package ffi
 

fvm_stub.go

@@ -1,4 +1,4 @@
-//go:build !fvm
+//go:build nofvm
 
 package ffi
 

install-filcrypto

@@ -218,6 +218,13 @@ build_from_source() {
         fi
     fi
 
+    # Use -no-fvm GPU feature variants when FVM is disabled
+    if [ -n "${FFI_DISABLE_FVM}" ] && [ -n "${gpu_flags}" ]; then
+        echo "FFI_DISABLE_FVM is set, using no-fvm GPU variant"
+        gpu_flags="${gpu_flags}-no-fvm"
+    fi
+    echo "DEBUG: FFI_DISABLE_FVM=${FFI_DISABLE_FVM} gpu_flags=${gpu_flags}"
+
     # Default to use multicore_sdr flags, unless specified to disable
     use_multicore_sdr="multicore-sdr"
     if [ "${FFI_USE_MULTICORE_SDR}" == "0" ]; then
@@ -237,7 +244,7 @@ build_from_source() {
     [ -n "${use_multicore_sdr}" ] && features+=("${use_multicore_sdr}")
 
     [ -n "${gpu_flags}" ] && features+=("${gpu_flags#,}")
-    [ "${FFI_DISABLE_FVM}" != "1" ] && features+=("fvm")
+    [ -z "${FFI_DISABLE_FVM}" ] && features+=("fvm")
     [ -n "${use_fixed_rows_to_discard}" ] && features+=("${use_fixed_rows_to_discard#,}")
     if [ "${FFI_USE_BLST_PORTABLE}" == "1" ] || [ "${FFI_PORTABLE}" == "1" ]; then
         features+=("blst-portable")

rust/Cargo.toml

@@ -87,6 +87,19 @@ opencl = [
   "fvm3/opencl",
   "fvm4/opencl",
 ]
+# GPU features without FVM (for builds that disable FVM)
+cuda-no-fvm = [
+  "filecoin-proofs-api/cuda",
+  "rust-gpu-tools/cuda",
+]
+cuda-supraseal-no-fvm = [
+  "filecoin-proofs-api/cuda-supraseal",
+  "rust-gpu-tools/cuda",
+]
+opencl-no-fvm = [
+  "filecoin-proofs-api/opencl",
+  "rust-gpu-tools/opencl",
+]
 multicore-sdr = ["filecoin-proofs-api/multicore-sdr"]
 c-headers = ["safer-ffi/headers"]
 # This feature enables a fixed number of discarded rows for TreeR. The `FIL_PROOFS_ROWS_TO_DISCARD`

rust/scripts/build-release.sh

@@ -75,7 +75,7 @@ main() {
     # generate filcrypto.h
     # Check if FVM is in the build features - if so, include it in header generation
     local __header_features="c-headers"
-    if echo "${@:2}" | grep -q "fvm"; then
+    if echo "${@:2}" | tr ' ,' '\n' | grep -qx "fvm"; then
         __header_features="c-headers,fvm"
     fi
     RUSTFLAGS="${__rust_flags}" HEADER_DIR="." \