diff --git a/src/cuda/evaluator/interactions.cuh b/src/cuda/evaluator/interactions.cuh index 579ba412..8ede3f36 100644 --- a/src/cuda/evaluator/interactions.cuh +++ b/src/cuda/evaluator/interactions.cuh @@ -1,10 +1,10 @@ #ifndef evaluator_interactions_cuh_INCLUDED #define evaluator_interactions_cuh_INCLUDED -#include "alloc.cuh" -#include "numb.cuh" -#include "structs/rbag.cuh" -#include "structs/gnet.cuh" +#include "../alloc.cuh" +#include "../numb.cuh" +#include "../structs/rbag.cuh" +#include "../structs/gnet.cuh" // Linking // ------- diff --git a/src/cuda/hvm.cuh b/src/cuda/hvm.cuh index 6f15bdcc..8efa5201 100644 --- a/src/cuda/hvm.cuh +++ b/src/cuda/hvm.cuh @@ -10,6 +10,10 @@ //COMPILED_BOOK_BUF// ///COMPILED_INTERACT_CALL/// +#ifdef IO +void do_run_io(GNet* gnet, Book* book, Port port); +#endif + // Normalize the root net in book_buffer and print the result. extern "C" void hvm_cu(u32* book_buffer) { // Loads the Book @@ -36,7 +40,6 @@ extern "C" void hvm_cu(u32* book_buffer) { gnet_boot_redex(gnet, new_pair(new_port(REF, 0), ROOT)); #ifdef IO - void do_run_io(GNet* gnet, Book* book, Port port); do_run_io(gnet, book, ROOT); #else gnet_normalize(gnet); diff --git a/src/cuda/run.cu b/src/cuda/run.cu index 140ca091..d18a0c9f 100644 --- a/src/cuda/run.cu +++ b/src/cuda/run.cu @@ -1,7 +1,7 @@ +#include "hvm.cuh" #include #include #include -#include "hvm.cu" // Readback: λ-Encoded Ctr struct Ctr { @@ -823,7 +823,7 @@ Port io_dl_call(GNet* gnet, Port argm) { // Closes a loaded dylib, reclaiming the handle. // // Returns: Result<*, IOError> -Port io_dl_close(GNet* gnet, Book* book, Port argm) { +Port io_dl_close(GNet* gnet, Port argm) { void* dl = readback_dylib(argm); if (dl == NULL) { fprintf(stderr, "io_dl_close: invalid handle\n"); diff --git a/src/main.rs b/src/main.rs index 6bf320db..70735997 100644 --- a/src/main.rs +++ b/src/main.rs @@ -145,7 +145,7 @@ fn main() { //let hvm_c = hvm_c.replace("#define INTERPRETED", "#define COMPILED"); // Generates the Cuda file - let hvm_cu = include_str!("cuda/hvm.cu"); + let hvm_cu = include_str!("cuda/main.cu"); let hvm_cu = format!("#define IO\n\n{hvm_cu}"); let hvm_cu = hvm_cu.replace("//COMPILED_BOOK_BUF//", &bookb); let hvm_cu = hvm_cu.replace("#define WITHOUT_MAIN", "#define WITH_MAIN");