diff --git a/.gitignore b/.gitignore index fbc4726..25d1efd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.a +main +main.exe main-sb* main-lb* output.txt -seeds.txt \ No newline at end of file diff --git a/makefile b/makefile index 3db7029..0669883 100644 --- a/makefile +++ b/makefile @@ -72,14 +72,14 @@ all: main clean: rm -f main libcubiomes.a biomenoise.o biomes.o finders.o generator.o layers.o noise.o cubiomes.o gpu.o cpu.o client.o server.o -libcubiomes.a: +libcubiomes.a: $(CUBIOMES_SRC) $(CC) -c $(CUBIOMES_SRC) -fwrapv $(CFLAGS) $(AR) rcs libcubiomes.a biomenoise.o biomes.o finders.o generator.o layers.o noise.o cubiomes.o: src/cubiomes.c src/cubiomes.h $(CC) -c $< -o $@ $(CFLAGS) -gpu.o: src/gpu.cu src/gpu.h src/common.h src/Random.h +gpu.o: src/gpu.cu src/gpu.h src/common.h src/Random.h src/kernel_0A.h src/kernel_0B.h nvcc -c $< -o $@ $(NVCC_FLAGS) cpu.o: src/cpu.cpp src/cpu.h src/common.h src/cubiomes.h diff --git a/src/gpu.cu b/src/gpu.cu index 2dd041d..7d00c6b 100644 --- a/src/gpu.cu +++ b/src/gpu.cu @@ -1675,7 +1675,7 @@ void GpuThread::run() { std::printf("Initializing device %d\n", device); TRY_CUDA(cudaSetDevice(device)); - cudaFuncSetAttribute(KernelFilterGradVecs1::kernel, cudaFuncAttributePreferredSharedMemoryCarveout, 100); + TRY_CUDA(cudaFuncSetAttribute(KernelFilterGradVecs1::kernel, cudaFuncAttributePreferredSharedMemoryCarveout, 100)); init_grad_dot_table(); init_conv_kernels(); diff --git a/src/main.cpp b/src/main.cpp index 9687241..bf6603c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -112,6 +112,7 @@ struct Args { auto address = split_address(argv[i++]); if (!address) { std::fprintf(stderr, "invalid argument to --client\n"); + return false; } client = std::move(address); } else if (std::strcmp("--server", arg) == 0) { @@ -120,6 +121,7 @@ struct Args { auto address = split_address(argv[i++]); if (!address) { std::fprintf(stderr, "invalid argument to --server\n"); + return false; } server = std::move(address); } else if (std::strcmp("--output", arg) == 0) { @@ -303,11 +305,13 @@ int main_inner(int argc, char **argv) { if (output_file != nullptr) { std::fclose(output_file); } + + return 0; } int main(int argc, char **argv) { try { - main_inner(argc, argv); + return main_inner(argc, argv); } catch (std::exception &e) { std::fprintf(stderr, "Uncaught exception in main: %s\n", e.what()); std::abort();