RSDK-10366 - rust utils for windows

.github/workflows/conan.yml

@@ -40,6 +40,55 @@ jobs:
           github.event_name == 'schedule' &&
           steps.git_info.outputs.current_commit == steps.last_successful_commit.outputs.commit-hash
 
+  # CR erodkin: we have (expected) working rust-utils builds now, but need to get that merged.
+  # once it is and we have a new release, try actually testing and delete the TODO.
+  # TODO(RSDK-10638) - uncomment and make all this work once we have good rust-utils windows builds
+  build_windows:
+    if: github.repository_owner == 'viamrobotics'
+    needs: [prepare]
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-windows
+            platform: windows_x86_64
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Install cmake
+        uses: ssrobins/install-cmake@v1
+        with:
+          version: 3.27.2
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install Scoop
+        uses: MinoruSekine/[email protected]
+
+      - name: install buf 'n stuff
+        run: scoop install buf ninja
+
+      - name: Install dependencies
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install -y conan git
+
+      - name: Create package
+        shell: powershell
+        run: |
+          Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+          refreshenv
+          conan profile detect
+          conan create .
+        env:
+          CONAN_USER_HOME: c:/cache
+          CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
+
   build_macos:
     if: github.repository_owner == 'viamrobotics'
     needs: [prepare]

.github/workflows/release.yml

@@ -36,6 +36,77 @@ jobs:
         uses: andymckay/[email protected]
         if: steps.release_exists.outputs.id != ''
 
+
+  # CR erodkin: we have (expected) working rust-utils builds now, but need to get that merged.
+  # once it is and we have a new release, try actually testing and delete the TODO.
+  # TODO (RSDK-10638) - uncomment and make all this work once we have good rust-utils windows builds
+  build_windows:
+    if: github.repository_owner == 'viamrobotics'
+    needs: [prepare]
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-windows
+            platform: windows_x86_64
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.prepare.outputs.sha }}
+
+      - name: Install cmake
+        uses: ssrobins/install-cmake@v1
+        with:
+          version: 3.27.2
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install Scoop
+        uses: MinoruSekine/[email protected]
+
+      - name: install buf 'n stuff
+        run: scoop install buf ninja
+
+      - name: Install dependencies
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install -y conan git
+
+      - name: Create package
+        shell: powershell
+        run: |
+          Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+          refreshenv
+          conan profile detect
+          conan create .
+        env:
+          CONAN_USER_HOME: c:/cache
+          CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
+
+      - name: list stuff
+        run: |
+          ls
+          ls build/
+
+      - name: Copy
+        run: |
+          cmake --install build --prefix builds/viam-cpp-sdk-${{ matrix.platform }}
+
+      - name: Create tar
+        run: |
+          tar -czvf builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz builds/viam-cpp-sdk-${{ matrix.platform }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: viam-cpp-sdk-${{ matrix.platform }}.tar.gz
+          path: builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz
+
   build_macos:
     if: github.repository_owner == 'viamrobotics'
     needs: [prepare]

.gitignore

@@ -5,7 +5,9 @@
 /build/*
 
 # For now, ignore any viam_rust_utils library in the root.
+# The `lib` prefix is on unix-based systems only
 /libviam_rust_utils*
+/viam_rust_utils*
 
 # Ignore clang cache.
 /.cache/

BUILDING.md

@@ -260,6 +260,26 @@ have a different version of `protoc` available in your `PATH`, it will
 silently fail and later cause compilation failures due to protobuf
 version mismatches.
 
+## Building for Windows
+
+The C++ SDK works well on windows for both client and module code 
+provided there is internet connectivity. However, some manual work is
+required to build for client code.
+
+1. (client code only) clone [rust-utils](https://github.com/viamrobotics/rust-utils) >= v0.3.0 and
+build locally with `cargo build --release`. Copy `target\release\viam_rust_utils.lib`
+to the root of the C++ SDK directory.
+2. Ensure `conan` is installed (see `Building with Conan` above).
+3. Run the following:
+```
+conan profile detect
+cmake . --preset conan-default <cmake args>
+cmake --build --preset=conan-release -j
+```
+
+NOTE: There is no current support for offline mode as a client, though
+this is being worked on.
+
 ## Options to Configure or Customize the Build
 
 ### Options for Package Search

CMakeLists.txt

@@ -266,14 +266,20 @@ if (viam_rust_utils_files)
     ${viam_rust_utils_file}
     ONLY_IF_DIFFERENT
   )
-elseif(NOT WIN32) # TODO(RSDK-10366): Currently, rust_utils is not published for windows, so don't even try downloading
+elseif(NOT WIN32 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
   set(lvru_system_name ${CMAKE_SYSTEM_NAME})
   if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(lvru_system_name "macosx")
   endif()
+
+  set(lvru_system_processor ${CMAKE_SYSTEM_PROCESSOR})
+  if(WIN32)
+    set(lvru_system_processor "x86_64")
+  endif()
+
   file(
     DOWNLOAD
-    https://github.com/viamrobotics/rust-utils/releases/latest/download/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils-${lvru_system_name}_${CMAKE_SYSTEM_PROCESSOR}${CMAKE_STATIC_LIBRARY_SUFFIX}
+    https://github.com/viamrobotics/rust-utils/releases/latest/download/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils-${lvru_system_name}_${lvru_system_processor}${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${viam_rust_utils_file}
     STATUS lvru_status
   )
@@ -283,21 +289,30 @@ elseif(NOT WIN32) # TODO(RSDK-10366): Currently, rust_utils is not published for
   if(NOT lvru_status_code EQUAL 0)
     message(FATAL_ERROR "No local viam_rust_utils found and failed to download: ${lvru_status_string}")
   endif()
-
+else()
+    message(WARNING "Currently running on Windows with no rust-utils file. Module code should work as expected, but client code may fail unexpectedly.")
 endif()
 
-# TODO(RSDK-10366): Currently, rust_utils is not published for windows, so don't even declare the library
-if (NOT WIN32)
+if (NOT WIN32) # build `SHARED` on unix-based systems
   add_library(viam_rust_utils SHARED IMPORTED)
-
   target_link_directories(viam_rust_utils
     INTERFACE
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>"
   )
+  set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
 
+elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") # build `STATIC` for windows
+  add_library(viam_rust_utils STATIC IMPORTED)
+  target_link_directories(viam_rust_utils
+    INTERFACE
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+  )
   set_property(TARGET viam_rust_utils PROPERTY IMPORTED_LOCATION ${viam_rust_utils_file})
+endif()
+
 
+if (NOT WIN32) # installing seems to be necessary for tests to pass in CI
   install(
     IMPORTED_RUNTIME_ARTIFACTS viam_rust_utils
     LIBRARY COMPONENT viam-cpp-sdk_runtime

conanfile.py

@@ -91,10 +91,7 @@ def package(self):
 
     def package_info(self):
 
-        # TODO(RSDK-10366): Currently, rust_utils is not published for windows
-        # and the C++ SDK just doesn't include it as a dependency on that platform
-        if not self.settings.os == "Windows":
-            self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
+        self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
 
         self.cpp_info.components["viamsdk"].libs = ["viamsdk"]
 
@@ -137,11 +134,8 @@ def package_info(self):
             "viamapi",
         ])
 
-        # TODO(RSDK-10366): Currently, rust_utils is not published for windows
-        # and the C++ SDK just doesn't include it as a dependency on that platform
-        if self.settings.os != "Windows":
-            self.cpp_info.components["viamsdk"].requires.extend([
-                "viam_rust_utils"
-            ])
+        self.cpp_info.components["viamsdk"].requires.extend([
+            "viam_rust_utils"
+        ])
 
         self.cpp_info.components["viamsdk"].frameworks = ["Security"]

src/viam/examples/README.md

@@ -56,7 +56,7 @@ char *path = dial("<your robot uri here>", "<your authentication type>", "<your
 Then to obtain a robot client do :
 
 ``` c++
-std::string address("unix://");
+std::string address("unix:");
 address += path;
 RobotServiceClient client(grpc::CreateChannel(address, grpc::InsecureChannelCredentials()));
 ```

src/viam/examples/mlmodel/example_audio_classification_client.cpp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifdef _WIN32
+#define NOMINMAX
+#endif
+
 #include <chrono>
 #include <cstdlib>
 #include <fstream>
@@ -377,7 +381,7 @@ int main(int argc, char* argv[]) try {
             });
 
             // Print out the top 5 (or fewer) label/score pairs.
-            for (size_t i = 0; i != std::min(5UL, scored_labels.size()); ++i) {
+            for (size_t i = 0; i != std::min<std::size_t>(5UL, scored_labels.size()); ++i) {
                 // TODO: Avoid hardcoding the width here.
                 VIAM_SDK_LOG(info) << boost::format("%1%: %2% %|40t|%3%\n") % i %
                                           *scored_labels[i].label % scored_labels[i].score;

src/viam/examples/modules/complex/gizmo/api.hpp

@@ -30,12 +30,14 @@ class Gizmo : public Component {
     explicit Gizmo(std::string name);
 };
 
-namespace viam::sdk {
+namespace viam {
+namespace sdk {
 template <>
 struct API::traits<Gizmo> {
     static ::viam::sdk::API api();
 };
-}  // namespace viam::sdk
+}  // namespace sdk
+}  // namespace viam
 
 // `GizmoClient` is the gRPC client implementation of a `Gizmo` component.
 class GizmoClient : public Gizmo {

src/viam/examples/modules/complex/summation/api.hpp

@@ -29,12 +29,14 @@ class Summation : public Service {
     explicit Summation(std::string name);
 };
 
-namespace viam::sdk {
+namespace viam {
+namespace sdk {
 template <>
 struct API::traits<Summation> {
     static API api();
 };
-}  // namespace viam::sdk
+}  // namespace sdk
+}  // namespace viam
 
 // `SummationClient` is the gRPC client implementation of a `Summation`
 // service.

src/viam/sdk/CMakeLists.txt

@@ -276,10 +276,10 @@ target_link_libraries(viamsdk
   PRIVATE Threads::Threads
 )
 
-# TODO(RSDK-10366): Currently, rust_utils is not published for
-# windows, so don't link to it.  Instead, link a stub implementation
+# TODO(RSDK-10637): Currently, rust_utils for windows doesn't link correctly when built in CI,
+# so don't link to it unless the user has provided a file for it.  Instead, link a stub implementation
 # that just calls `abort`.
-if (NOT WIN32)
+if (NOT WIN32 OR num_viam_rust_utils_files GREATER 0)
   target_link_libraries(viamsdk
     PRIVATE viam_rust_utils
   )
@@ -289,9 +289,14 @@ endif()
 
 if (APPLE)
   target_link_libraries(viamsdk PUBLIC "-framework Security")
-else()
+elseif (NOT WIN32)
   target_link_libraries(viamsdk PRIVATE dl)
   target_link_libraries(viamsdk PRIVATE rt)
+else()
+  target_link_libraries(viamsdk PRIVATE ncrypt)
+  target_link_libraries(viamsdk PRIVATE secur32)
+  target_link_libraries(viamsdk PRIVATE ntdll)
+  target_link_libraries(viamsdk PRIVATE userenv)
 endif()
 
 

src/viam/sdk/robot/client.cpp

@@ -294,7 +294,7 @@ std::shared_ptr<RobotClient> RobotClient::at_address(const std::string& address,
 
 std::shared_ptr<RobotClient> RobotClient::at_local_socket(const std::string& address,
                                                           const Options& options) {
-    const std::string addr = "unix://" + address;
+    const std::string addr = "unix:" + address;
     auto robot = RobotClient::with_channel(
         ViamChannel(sdk::impl::create_viam_channel(addr, grpc::InsecureChannelCredentials())),
         options);

src/viam/sdk/robot/client.hpp

@@ -97,7 +97,7 @@ class RobotClient {
     /// @brief Creates a robot client connected to the robot at the provided local socket.
     /// @param address The local socket of the robot (a .sock file, etc.).
     /// @param options Options for connecting and refreshing.
-    /// Creates a direct connection to the robot using the `unix://` scheme.
+    /// Creates a direct connection to the robot using the `unix:` scheme.
     /// Only useful for connecting to robots across Unix sockets.
     static std::shared_ptr<RobotClient> at_local_socket(const std::string& address,
                                                         const Options& options);