From f5c10774005a363764776d5d507024e163a3625b Mon Sep 17 00:00:00 2001 From: Joe Rivera Date: Sun, 27 Sep 2026 17:49:20 -0500 Subject: [PATCH] =?UTF-8?q?cvcpkg(libcvc):=20wasm=20republish=20=E2=80=94?= =?UTF-8?q?=20format=20v2=20host,=20CVC=5FSTATE=5FEXEC=3DON,=20guard=20gRP?= =?UTF-8?q?C=20deps=20off=20wasm=20(rev=202->3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Coordinated wasm-mt republish so the catalog carries the coef_mlp .cvcnav format v2 (two-head sigmoid, #436), and to fix two wasm defects: - CVC_STATE_EXEC was wrongly forced OFF in the wasm build; the state_exec evaluator has no gRPC dependency and must always build. Turned ON. - the gRPC/xmlrpc transport deps (openssl/c-ares/re2/abseil/protobuf/grpc) were declared for ALL platforms incl wasm, but wasm builds without that transport and they are not published for wasm -> 'cvcpkg install cvc/libcvc --platform wasm-mt' could not resolve. Guarded to the native build matrix (linux/macos/windows). cvc_revision 2->3 so publish-cvcgl-wasm produces a fresh 3.4.0+cvc.3. --- .github/workflows/publish-cvcgl-wasm.yml | 2 +- cvcpkg/recipes/libcvc/recipe.yaml | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-cvcgl-wasm.yml b/.github/workflows/publish-cvcgl-wasm.yml index 53a4e4b3..839554e0 100644 --- a/.github/workflows/publish-cvcgl-wasm.yml +++ b/.github/workflows/publish-cvcgl-wasm.yml @@ -98,7 +98,7 @@ jobs: -DCVC_ENABLE_OPENMP=OFF -DDISABLE_CGAL=ON -DCVC_USING_HDF5=OFF \ -DCVC_USING_IMOD_MRC=OFF -DCVC_ENABLE_IMAGEMAGICK=ON -DCVC_ENABLE_FFTW=OFF \ -DCVC_FFT_PROVIDER=none -DCVC_ENABLE_ASSIMP=ON \ - -DCVC_ENABLE_MESHER=OFF -DCVC_ENABLE_SDF=ON -DCVC_STATE_EXEC=OFF \ + -DCVC_ENABLE_MESHER=OFF -DCVC_ENABLE_SDF=ON -DCVC_STATE_EXEC=ON \ -DCVC_BUILD_CVCGL=ON -DCVC_BUILD_EXAMPLES=OFF -DCVC_WASM_PTHREADS=ON cmake --build build-wasm --target cvc cvcGL -j"$(nproc)" cmake --install build-wasm diff --git a/cvcpkg/recipes/libcvc/recipe.yaml b/cvcpkg/recipes/libcvc/recipe.yaml index 1479de10..2bf33531 100644 --- a/cvcpkg/recipes/libcvc/recipe.yaml +++ b/cvcpkg/recipes/libcvc/recipe.yaml @@ -77,7 +77,13 @@ recipe: # and will not compile until 3.4.0+cvc.2 (with the setter) is published. The # published 3.4.0+cvc.1 predates #433. cvcgl already sits at +cvc.2, so this # brings the tested-together family back to a single revision. - cvc_revision: 2 + # Bumped 2 -> 3 (3.4.0 lineage): republish the family carrying the coef_mlp .cvcnav format v2 + # (two-head sigmoid λ_soft/λ_hard, #436). The wasm-mt republish also (a) turns CVC_STATE_EXEC back + # ON for wasm (it was wrongly forced OFF — the state_exec evaluator has no gRPC dependency and must + # always build), and (b) picks up the gRPC/xmlrpc dep guard above so `cvcpkg install cvc/libcvc + # --platform wasm-mt` resolves again. A v2 .cvcnav hard-fails on a pre-v2 host, so hosts (demo3 / + # cvcdbg fleet) must land 3.4.0+cvc.3 before any v2 blob ships. + cvc_revision: 3 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" maintainer_url: "https://cvcpkg.org" @@ -235,12 +241,24 @@ depends: # falls back to `find_dependency(LAPACK)` — which resolves to Accelerate. - name: openblas platforms: [linux, freebsd, openbsd, netbsd, windows] + # The gRPC/xmlrpc network state-transport stack (CVC_USING_XMLRPC + CVC_ENABLE_GRPC). + # Scoped to the platforms this recipe actually BUILDS the transport on (the build matrix + # below: linux/macos/windows). The wasm-mt bundle (built separately by publish-cvcgl-wasm.yml, + # xmlrpc/grpc OFF, CVC_STATE_EXEC ON) links none of these, so declaring them for wasm made + # `cvcpkg install cvc/libcvc --platform wasm-mt` fail to resolve (abseil/protobuf/grpc are not + # published for wasm). The state_exec evaluator is independent of this stack and stays on. - name: openssl + platforms: [linux, macos, windows] - name: c-ares + platforms: [linux, macos, windows] - name: re2 + platforms: [linux, macos, windows] - name: abseil + platforms: [linux, macos, windows] - name: protobuf + platforms: [linux, macos, windows] - name: grpc + platforms: [linux, macos, windows] - name: pthreads4w platforms: [windows] host_tools: