updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.github/workflows/rust.yml

@@ -57,10 +57,10 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Rustfmt
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all --exclude generator -- --check
 
       - name: Build
-        run: cargo build --all
+        run: cargo build --all --exclude generator
 
       # Don't currently test because many tests rely on the system having a CUDA GPU
       # - name: Test
@@ -69,5 +69,5 @@ jobs:
       - name: Clippy
         env:
           RUSTFLAGS: -Dwarnings
-        run: cargo clippy --all --tests
+        run: cargo clippy --all --tests --exclude generator
 

Cargo.toml

@@ -33,6 +33,6 @@ cuda_builder = "0.3.0"
 
 [workspace]
 members = [
-	"generator",
+	#"generator",
     "gpu",
 ]

generator/Cargo.toml

@@ -8,5 +8,5 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.75"
 aoc-client = "0.2.0"
-regex = "1.7.1"
+regex = "=1.7.1"
 textwrap = "0.16.0"

generator/src/main.rs

@@ -84,12 +84,14 @@ fn generate_template(
 
     // Read the puzzle markdown.
     let puzzle_markdown = std::fs::read_to_string(puzzle_filename)?;
+    println!("Puzzle markdown: {}", puzzle_markdown);
 
     // Clean up the puzzle markdown file.
     std::fs::remove_file(puzzle_filename)?;
 
     // Parse the puzzle markdown.
     let puzzle = Puzzle::parse(&puzzle_markdown)?;
+    println!("Puzzle: {:#?}", puzzle);
 
     let src_dir = working_dir.join("src");
 
@@ -275,6 +277,13 @@ fn trim_answer(comment: &str) -> Result<String> {
         .trim()
         .to_string();
 
+    let cleaned = cleaned
+        .split("To begin, get your puzzle")
+        .next()
+        .ok_or_else(|| anyhow::anyhow!("Missing comment"))?
+        .trim()
+        .to_string();
+
     // Make sure the output width set correctly.
     let markdown = replace_doc_links(&cleaned)?;
 
@@ -332,12 +341,16 @@ fn replace_old_comment(
     lines.drain(comment_index..fn_index);
 
     // Insert the new comments at the comment index.
-    let part_comment = format!(
-        "/// {}",
-        new_comment
-            .replace('\n', "\n/// ")
-            .replace("\n/// \n", "\n///\n")
-    );
+    let part_comment = if new_comment.is_empty() {
+        "/// Not yet unlocked.".to_string()
+    } else {
+        format!(
+            "/// {}",
+            new_comment
+                .replace('\n', "\n/// ")
+                .replace("\n/// \n", "\n///\n")
+        )
+    };
     lines.insert(comment_index, &part_comment);
 
     Ok(lines.join("\n"))

gpu/src/day08.rs

@@ -0,0 +1,46 @@
+//!  CUDA Kernel for day 08: Haunted Wasteland
+
+use cuda_std::*;
+
+/// Traverse the graph from nodes ending with A until all nodes reach nodes
+/// ending with Z.
+#[kernel]
+#[allow(clippy::missing_safety_doc)]
+pub unsafe fn graph_traversal(
+    graph: &[(u32, u32)],
+    start: &[u32],
+    goals: &[u32],
+    directions: &[bool], // true for left, false for right
+    nodes: *mut u32,
+    steps: *mut u64,
+) {
+    let nodes_len = goals.len();
+    let mut items = start.to_vec();
+    for i in directions {
+        let idx = thread::index_1d() as usize;
+        let mut found = true;
+
+        if idx < nodes_len {
+            let mut node = items[idx];
+            if *i {
+                node = graph[node as usize].0;
+            } else {
+                node = graph[node as usize].1;
+            }
+
+            if found && !goals.contains(&node) {
+                found = false;
+            }
+
+            items.insert(idx, node);
+            let elem = &mut *nodes.add(idx);
+            *elem = node;
+            let elem = &mut *steps.add(idx);
+            *elem = 1;
+        }
+
+        if found {
+            break;
+        }
+    }
+}

gpu/src/lib.rs

@@ -28,3 +28,4 @@
 extern crate alloc;
 
 pub mod add;
+pub mod day08;