Add functions to serialize to and deserialize from memory buffers

.github/workflows/lint.yml

@@ -23,14 +23,6 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Install capnp
-        run: |
-          curl -O https://capnproto.org/capnproto-c++-1.3.0.tar.gz
-          tar zxf capnproto-c++-1.3.0.tar.gz
-          cd capnproto-c++-1.3.0
-          ./configure
-          make -j6 check
-          sudo make install
       - name: Set up Clang ${{ env.CLANG_VERSION }}
         env:
           TEMP_DIR: ${{ runner.temp }}

.github/workflows/test.yml

@@ -19,14 +19,6 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Install capnp
-        run: |
-          curl -O https://capnproto.org/capnproto-c++-1.3.0.tar.gz
-          tar zxf capnproto-c++-1.3.0.tar.gz
-          cd capnproto-c++-1.3.0
-          ./configure
-          make -j6 check
-          sudo make install
       - name: Set up MLIR
         uses: munich-quantum-software/setup-mlir@97da765dfa9dc8e055611ca934fe51bcade8140c # v1.3.0
         with:

cmake/ExternalDependencies.cmake

@@ -1,4 +1,5 @@
 include(FetchContent)
+
 set(FETCH_PACKAGES "")
 
 if(BUILD_JEFF_MLIR_TRANSLATION)
@@ -9,7 +10,23 @@ if(BUILD_JEFF_MLIR_TRANSLATION)
     )
     list(APPEND FETCH_PACKAGES jeff)
 
-    find_package(CapnProto REQUIRED)
+    if(WIN32)
+        set(WITH_FIBERS
+            OFF
+            CACHE
+                BOOL
+                "Disable fiber support on Windows to avoid a build error due to disabled exceptions"
+                FORCE
+        )
+    endif()
+    FetchContent_Declare(
+        capnproto
+        GIT_REPOSITORY https://github.com/capnproto/capnproto.git
+        GIT_TAG v1.3.0
+        PATCH_COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> patch --forward -p1 -i
+                      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/patches/capnproto-disable-tests.patch
+    )
+    list(APPEND FETCH_PACKAGES capnproto)
 endif()
 
 if(BUILD_JEFF_MLIR_TESTS)

cmake/patches/capnproto-disable-tests.patch

@@ -0,0 +1,11 @@
+diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -1,5 +1,8 @@
+
++# Disable vendored Cap'n Proto tests when consumed through FetchContent.
++set(BUILD_TESTING OFF)
++
+ # Tests ========================================================================
+
+ if(BUILD_TESTING)

include/jeff/Translation/Deserialize.hpp

@@ -1,14 +1,24 @@
 #pragma once
 
-#include <llvm/ADT/StringRef.h>
+#include <capnp/common.h>
 #include <mlir/IR/BuiltinOps.h>
 #include <mlir/IR/MLIRContext.h>
 #include <mlir/IR/OwningOpRef.h>
 
+/**
+ * @brief Deserialize a memory buffer containing a serialized .jeff module into an MLIR module.
+ * @param context The MLIR context to use for the deserialization.
+ * @param buffer A memory buffer containing the serialized jeff module.
+ * @return An owning reference to the deserialized MLIR module.
+ */
+mlir::OwningOpRef<mlir::ModuleOp> deserialize(mlir::MLIRContext* context,
+                                              kj::ArrayPtr<capnp::word> buffer);
+
 /**
  * @brief Deserialize a .jeff file into an MLIR module.
  * @param context The MLIR context to use for the deserialization.
  * @param path The path to the .jeff file.
  * @return An owning reference to the deserialized MLIR module.
  */
-mlir::OwningOpRef<mlir::ModuleOp> deserialize(mlir::MLIRContext* context, llvm::StringRef path);
+mlir::OwningOpRef<mlir::ModuleOp> deserializeFromFile(mlir::MLIRContext* context,
+                                                      llvm::StringRef path);

include/jeff/Translation/Serialize.hpp

@@ -1,10 +1,23 @@
 #pragma once
 
-#include <llvm/ADT/StringRef.h>
+#include <capnp/common.h>
+#include <kj/array.h>
 #include <mlir/IR/BuiltinOps.h>
 
 /**
- * @brief Serialize an MLIR module into a .jeff file.
+ * @brief Serialize an MLIR module containing a jeff program into a memory buffer.
+ * @param module The MLIR module to serialize.
+ * @return An owned memory buffer containing the serialized jeff module.
+ *
+ * @details
+ * Known limitations:
+ *
+ * - Only one-dimensional tensors with dynamic size are supported.
+ */
+kj::Array<capnp::word> serialize(mlir::ModuleOp module);
+
+/**
+ * @brief Serialize an MLIR module containing a jeff program into a .jeff file.
  * @param module The MLIR module to serialize.
  * @param path The path to the .jeff file.
  *
@@ -13,4 +26,4 @@
  *
  * - Only one-dimensional tensors with dynamic size are supported.
  */
-void serialize(mlir::ModuleOp module, llvm::StringRef path);
+void serializeToFile(mlir::ModuleOp module, llvm::StringRef path);

lib/Translation/CMakeLists.txt

@@ -3,18 +3,17 @@ add_mlir_library(
     Deserialize.cpp
     Serialize.cpp
     LINK_LIBS
+    PRIVATE
     MLIRJeff
     MLIRFuncDialect
+    PUBLIC
     CapnProto::capnp
     DISABLE_INSTALL
 )
 
-target_compile_definitions(MLIRJeffTranslation PRIVATE ${CAPNP_DEFINITIONS})
-
 target_include_directories(
-    MLIRJeffTranslation
-    PRIVATE ${CAPNP_INCLUDE_DIRS}
-    PUBLIC ${jeff_SOURCE_DIR}/impl/cpp/src/capnp ${jeff_BINARY_DIR}/impl/cpp/src/capnp
+    MLIRJeffTranslation PUBLIC ${jeff_SOURCE_DIR}/impl/cpp/src/capnp
+                               ${jeff_BINARY_DIR}/impl/cpp/src/capnp
 )
 
 target_sources(MLIRJeffTranslation PUBLIC ${jeff_SOURCE_DIR}/impl/cpp/src/capnp/jeff.capnp.c++)