From f6da8ebf029099749c3be53deafcd6913bebc776 Mon Sep 17 00:00:00 2001
From: Colin Unger <lockshaw@lockshaw.net>
Date: Thu, 4 Apr 2024 02:43:48 -0700
Subject: [PATCH 1/2] Update proj version and add .proj.toml file to repo
 directly

---
 .proj.toml | 21 +++++++++++++++++++++
 flake.lock |  6 +++---
 flake.nix  |  6 ++----
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 .proj.toml

diff --git a/.proj.toml b/.proj.toml
new file mode 100644
index 0000000000..a4592dcccc
--- /dev/null
+++ b/.proj.toml
@@ -0,0 +1,21 @@
+project_name = "flexflow"
+testsuite_macro = "FF_TEST_SUITE"
+namespace_name = "FlexFlow"
+header_extension = ".h"
+
+build_targets = [
+  "utils",
+  "op-attrs",
+  "kernels",
+  "substitutions",
+  "compiler",
+]
+test_targets = [
+  "utils-tests",
+  "substitutions-tests",
+  "compiler-tests",
+]
+
+[cmake_flags_extra]
+FF_CUDA_ARCH = "60"
+CMAKE_CUDA_ARCHITECTURES = "60"
diff --git a/flake.lock b/flake.lock
index ea4187e13c..ffd4a02962 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711832134,
-        "narHash": "sha256-2KceZmXOOELnFiVH/wjndH2QtKro+B0W2SEkjkzuDD0=",
+        "lastModified": 1712222904,
+        "narHash": "sha256-FRI/RdOTtmo9o7iwZiACD0lSSlgvKqcpppjliXUHyRU=",
         "owner": "lockshaw",
         "repo": "proj",
-        "rev": "1c7c809a6cab8360620bb27470a615a1a0b03a17",
+        "rev": "5b7a82dc01fa25076a8b3db96c1f2ea4752ae990",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bd372e4cbf..c3e415cf89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
-
+    
     proj-repo = {
       url = "github:lockshaw/proj";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -60,7 +60,7 @@
       devShells = rec {
         ci = mkShell {
           shellHook = ''
-            export PATH="$HOME/ff/.scripts/:$PATH"
+            export PATH="$HOME/ff/.scripts/:$HOME/ff/.modules/proj/bin/:$PATH"
           '';
           
           CMAKE_FLAGS = lib.strings.concatStringsSep " " [
@@ -71,7 +71,6 @@
             "-DFF_USE_EXTERNAL_SPDLOG=ON"
             "-DFF_USE_EXTERNAL_DOCTEST=ON"
             "-DFF_USE_EXTERNAL_RAPIDCHECK=ON"
-            "-DFF_USE_EXTERNAL_EXPECTED=ON"
             "-DFF_USE_EXTERNAL_RANGEV3=ON"
             "-DFF_USE_EXTERNAL_BOOST_PREPROCESSOR=ON"
             "-DFF_USE_EXTERNAL_TYPE_INDEX=ON"
@@ -95,7 +94,6 @@
               cudaPackages.nccl
               cudaPackages.libcublas
               cudaPackages.cuda_cudart
-              tl-expected
             ])
             (with self.packages.${system}; [
               legion

From 06e049f8c4282fc046fde5c24946c95814dcc79f Mon Sep 17 00:00:00 2001
From: Colin Unger <lockshaw@lockshaw.net>
Date: Thu, 4 Apr 2024 02:45:15 -0700
Subject: [PATCH 2/2] Revert changes to flake.nix

---
 flake.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index c3e415cf89..bd372e4cbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
-    
+
     proj-repo = {
       url = "github:lockshaw/proj";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -60,7 +60,7 @@
       devShells = rec {
         ci = mkShell {
           shellHook = ''
-            export PATH="$HOME/ff/.scripts/:$HOME/ff/.modules/proj/bin/:$PATH"
+            export PATH="$HOME/ff/.scripts/:$PATH"
           '';
           
           CMAKE_FLAGS = lib.strings.concatStringsSep " " [
@@ -71,6 +71,7 @@
             "-DFF_USE_EXTERNAL_SPDLOG=ON"
             "-DFF_USE_EXTERNAL_DOCTEST=ON"
             "-DFF_USE_EXTERNAL_RAPIDCHECK=ON"
+            "-DFF_USE_EXTERNAL_EXPECTED=ON"
             "-DFF_USE_EXTERNAL_RANGEV3=ON"
             "-DFF_USE_EXTERNAL_BOOST_PREPROCESSOR=ON"
             "-DFF_USE_EXTERNAL_TYPE_INDEX=ON"
@@ -94,6 +95,7 @@
               cudaPackages.nccl
               cudaPackages.libcublas
               cudaPackages.cuda_cudart
+              tl-expected
             ])
             (with self.packages.${system}; [
               legion