Minor fixes

Author: jsuarez5341

build.sh

@@ -19,7 +19,6 @@ set -e
 #   ./build.sh constellation         # Sweep dashboard -> ./seethestars
 #   ./build.sh cache_data            # Sweep log cache -> ./cache_data
 #   ./build.sh trailer               # 5.0 trailer -> ./resources/trailer/trailer (also exports diagrams)
-#   ./build.sh all                   # Build all envs native and native float32
 #
 # Env is compiled in. Run: ./puffer train|eval|match|sweep [--section.key=value ...]
 
@@ -99,6 +98,7 @@ fi
 CLANG_WARN=(
     -Wall
     -Wno-narrowing
+    -Wno-unreachable-code
     -ferror-limit=3
     -Werror=incompatible-pointer-types
     -Werror=return-type
@@ -370,7 +370,7 @@ elif [ "$MODE" = "web" ]; then
     emcc \
         -o "build/web/$ENV/game.html" \
         src/puffercpu.c $EXTRA_SRC \
-        -O3 -Wall -Wno-narrowing \
+        -O3 -Wall -Wno-narrowing -Wno-unreachable-code \
         "${LINK_ARCHIVES[@]}" \
         -I. -Isrc -I$SRC_DIR -Ivendor "${INCLUDES[@]}" \
         -L. -L./$RAYLIB_NAME/lib \
@@ -466,8 +466,15 @@ ENV_COMPILE_FLAGS=(-DENV_HEADER=\"$ENV_HEADER\")
 
 MODE=${MODE:-native}
 
-# Allow double→int/float in brace-init (host -Wno-narrowing + nvcc #2361).
-NVCC_NARROW=(-Xcompiler=-Wno-narrowing --diag-suppress=2361)
+# Brace-init narrowing (host -Wno-narrowing + nvcc #2361) and unreachable
+# code in env headers (clang -Wunreachable-code, nvcc #111/#128).
+NVCC_NARROW=(
+    -Xcompiler=-Wno-narrowing
+    -Xcompiler=-Wno-unreachable-code
+    --diag-suppress=2361
+    --diag-suppress=111
+    --diag-suppress=128
+)
 
 if [ "$MODE" = "native" ]; then
     if [ -n "$OUT" ]; then
@@ -486,14 +493,16 @@ if [ "$MODE" = "native" ]; then
             OSRS_RENDER_OBJECT="build/osrs_puffer_render.o"
             ENV_COMPILE_FLAGS+=(-DOSRS_PUFFER_RENDER)
             $CC $LINK_OPT "${CLANG_WARN[@]}" "${SIMD_FLAGS[@]}" -std=c11 \
+                -Wno-unused-function \
+                -D_POSIX_C_SOURCE=200809L \
                 -I. -Isrc -I$SRC_DIR -Ivendor \
                 "${INCLUDES[@]}" \
                 -DPLATFORM_DESKTOP \
                 -c ocean/osrs/osrs_puffer_render.c \
                 -o "$OSRS_RENDER_OBJECT"
             ;;
     esac
-    echo "Compiling native train/eval binary ($ARCH) -> $TRAIN_BIN..."
+    echo "Compiling $ENV_HEADER -> $TRAIN_BIN..."
     $NVCC $NVCC_OPT -arch=$ARCH -std=c++17 \
         -I. -Isrc -I$SRC_DIR -Ivendor \
         "${INCLUDES[@]}" \
@@ -514,13 +523,13 @@ if [ "$MODE" = "native" ]; then
         -L$CUDA_HOME/lib64 $NCCL_LFLAG \
         "${EXTRA_LDFLAGS[@]}" \
         -lcudart -lnccl -lnvidia-ml -lcublas -lcusolver -lcurand \
-        -lm -lpthread $OMP_LIB "${STANDALONE_LDFLAGS[@]}" \
+        -lm -Xlinker=-lpthread $OMP_LIB "${STANDALONE_LDFLAGS[@]}" \
         -o "$TRAIN_BIN"
     echo "Built: ./$TRAIN_BIN"
 
 elif [ "$MODE" = "profile" ]; then
     PROFILE_BIN="build/profile_${ENV}"
-    echo "Compiling profile binary ($ARCH) -> $PROFILE_BIN..."
+    echo "Compiling $ENV_HEADER -> $PROFILE_BIN..."
     $NVCC $NVCC_OPT -arch=$ARCH -std=c++17 \
         -I. -Isrc -I$SRC_DIR -Ivendor \
         "${INCLUDES[@]}" \
@@ -537,7 +546,7 @@ elif [ "$MODE" = "profile" ]; then
         "$RAYLIB_A" \
         -L$CUDA_HOME/lib64 \
         -lnccl -lnvidia-ml -lcublas -lcusolver -lcurand \
-        -lGL -lm -lpthread $OMP_LIB \
+        -lGL -lm -Xlinker=-lpthread $OMP_LIB \
         -o "$PROFILE_BIN"
     echo "Built: ./$PROFILE_BIN"
 fi

ocean/osrs/encounters/inferno/encounter_inferno_helpers.inc

@@ -828,7 +828,7 @@ typedef struct InfRouteBakeHeader {
     uint64_t revision_base;
 } InfRouteBakeHeader;
 
-_Static_assert(sizeof(InfRouteBakeHeader) == 64,
+static_assert(sizeof(InfRouteBakeHeader) == 64,
     "inferno route bake header must stay 64 bytes");
 
 static const char INF_ROUTE_BAKE_MAGIC[8] = {

ocean/osrs/osrs_assets.h

@@ -1,6 +1,10 @@
 #ifndef OSRS_ASSETS_H
 #define OSRS_ASSETS_H
 
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

ocean/osrs/osrs_env_profile.h

@@ -1,3 +1,6 @@
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
 #include <stdlib.h>
 #include <time.h>
 

ocean/osrs/osrs_puffer_render.c

@@ -1,3 +1,6 @@
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
 #define OSRS_VISUAL
 
 #include <stdlib.h>

ocean/osrs/osrs_visual.c

@@ -1,3 +1,6 @@
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

ocean/osrs/scripts/setup-data.sh

@@ -53,11 +53,8 @@ if [ "${OSRS_ASSET_SETUP_FORCE:-0}" != "1" ]; then
         echo "setup-osrs-data: loose assets satisfy ${archive_name}"
         exit 0
     fi
-    echo "setup-osrs-data: missing required loose assets"
-    while IFS=$'\t' read -r group_name asset_path; do
-        [ -n "${asset_path}" ] || continue
-        echo "setup-osrs-data: missing ${group_name}: ${asset_path}"
-    done < "${MISSING_TSV}"
+    missing_count=$(grep -c $'\t' "${MISSING_TSV}" || true)
+    echo "setup-osrs-data: missing ${missing_count} required loose assets; installing ${archive_name}"
 fi
 
 archive_path="${DOWNLOAD_DIR}/${archive_name}"