More updates to build2 files.

Author: brixen

.gitignore

@@ -1,5 +1,13 @@
 # Build artifacts
-.bdep/
+/build-*/
+/build_*/
+/build/bootstrap/
+/.bdep/
+.bpkg/
+
+**/*.config.build
+**/*.config.build.save
+
 *.o
 *.a
 *.so
@@ -21,6 +29,20 @@ Thumbs.db
 tests/static/*.txt
 tests/benchmarks/results/
 
+# Build2 symlinks exes from build dir to src dir for convenient
+examples/debug_conv
+examples/debug_pool
+examples/edge_detection
+examples/xor_gate
+tests/benchmarks/test_timing_consistency
+tests/unit/test_activations
+tests/unit/test_convolution
+tests/unit/test_fixed_point
+tests/unit/test_hash_basic
+tests/unit/test_hash_consistency
+tests/unit/test_matrix_reproducibility
+tests/unit/test_pooling
+
 # Temporary files
 *.tmp
 *.log

CMakeLists.txt

@@ -1,4 +1,5 @@
-/config.build
-/root/
-/bootstrap/
-build/
+*.config.build
+*.config.build.save
+*.variables.build
+
+.DS_Store

build/.gitignore

@@ -2,6 +2,5 @@ project = certifiable-inference
 
 using version
 using config
-using test
 using install
-using dist
+using test

build/bootstrap.build

@@ -0,0 +1,4 @@
+export \
+{
+  include = include/
+}

build/export.build

@@ -1,19 +1,11 @@
-c.std = 99
-
 using c
+using test
 
-# Strict C compiler flags
-c.coptions += -Wall -Wextra -Werror -pedantic -Wno-unused-parameter
+c.std = c99
+c.warnings = all
+c.coptions += -Werror -pedantic -Wno-unused-parameter
 
-# Enable -fanalyzer if available
 if ($c.id == 'gcc')
   c.coptions += -fanalyzer
 
-# Math library
-c.libs += -lm
-
-# Include directories
-c.poptions =+ "-I$out_root" "-I$src_root/include"
-
-using install
-using test
+c.poptions =+ "-I$src_root/include"

build/root.build

@@ -1,6 +1,7 @@
 ./: {*/ -build/ -tools/ -certifiable-build/ -include/ -.github/ -docs/} manifest
 
-# Import subdirectories
-import libs = src/
-import exes = examples/
+./: src/ examples/ tests/
+
+import src = src/
+import examples = examples/
 import tests = tests/

buildfile

@@ -1,6 +1,8 @@
-import libs = ../src/
+exes = exe{xor_gate edge_detection debug_conv debug_pool}
 
-exe{xor_gate}: c{xor_gate} $libs
-exe{edge_detection}: c{edge_detection} $libs
-exe{debug_conv}: c{debug_conv} $libs
-exe{debug_pool}: c{debug_pool} $libs
+exe{xor_gate}: c{xor_gate} ../src/liba{certifiable_inference}
+exe{edge_detection}: c{edge_detection} ../src/liba{certifiable_inference}
+exe{debug_conv}: c{debug_conv} ../src/liba{certifiable_inference}
+exe{debug_pool}: c{debug_pool} ../src/liba{certifiable_inference}
+
+./: $exes

examples/buildfile

@@ -1,3 +1,11 @@
-lib{certifiable_inference}: core/c{*} containers/c{*} ../include/h{*}
+liba{certifiable_inference}: \
+  c{core/**.c} \
+  c{containers/**.c} \
+  h{../include/**.h}
+{
+  export = true
+  install = true
+  libs = -lm
+}
 
-lib{certifiable_inference}: ../include/h{*}: install = include/
+./: liba{certifiable_inference}

src/buildfile

@@ -1,3 +1,10 @@
-import libs = ../../src/
+bench = exe{test_timing_consistency}
 
-exe{timing_benchmark}: c{test_timing_consistency} $libs
+exe{test_timing_consistency}: c{test_timing_consistency} ../../src/liba{certifiable_inference}
+
+$bench:
+{
+  test = true
+}
+
+./: $bench