* Bump libraries

palemieux · web-flow · commit 90d8fb3ca0f8 · 2023-11-14T14:10:44.000-08:00
* Fix scripts
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,14 +7,14 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 # Kakadu SDK support
 
 find_path(KDU_INCLUDE_DIR kdu_args.h PATH_SUFFIXES kakadu)
-find_library(KDU_LIBRARY NAMES libkdu_a82R)
+find_library(KDU_LIBRARY NAMES kdu_a84R)
 
 if(KDU_INCLUDE_DIR AND KDU_LIBRARY)
   set(KDU_PRESENT 1)
   message("Kakadu SDK found: ${KDU_LIBRARY} and ${KDU_INCLUDE_DIR}")
   include_directories(${KDU_INCLUDE_DIR})
 else()
-  message("Kakadu SDK not found.")
+  message("Kakadu SDK not found: ${KDU_LIBRARY} and ${KDU_INCLUDE_DIR}.")
 endif()
 
 # OpenJPH support
diff --git a/ext/OpenJPH b/ext/OpenJPH
@@ -1 +1 @@
-Subproject commit 02f29d35aa4e897a32b05ee7e4e171dd8e9ebe5d
+Subproject commit 5aab43ff59f4ed249bd09842d367489aefde8f47
diff --git a/ext/ffmpeg b/ext/ffmpeg
@@ -1 +1 @@
-Subproject commit 9ab20b1614194280b862d98dfcdb7b1bcff03329
+Subproject commit 84e400ae37b1e2849a3ead399ef86c808356cdd6
diff --git a/ext/lodepng b/ext/lodepng
@@ -1 +1 @@
-Subproject commit 5601b8272a6850b7c5d693dd0c0e16da50be8d8d
+Subproject commit c18b949b71f45e78b1f9a28c5d458bce0da505d6
diff --git a/ext/qoi b/ext/qoi
@@ -1 +1 @@
-Subproject commit e367cb19dfc2dcb3c3ced7f2d9e55bc0772f37e8
+Subproject commit 9c487be4fe2429c2cd8360043d902996a45e4ab6
diff --git a/ext/stb b/ext/stb
@@ -1 +1 @@
-Subproject commit af1a5bc352164740c1cc1354942b1c6b72eacb8a
+Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7
diff --git a/script/build.sh b/script/build.sh
@@ -5,12 +5,16 @@ set -e
 
 APP_DIR=~
 IMAGES_DIR=$APP_DIR/images/
-IMAGES_S3_BUCKET=s3://libench/images
+IMAGES_S3_BUCKET=s3://libench-images
 WWW_S3_BUCKET=s3://libench-website/
 CODE_REPO=https://github.com/sandflow/libench.git
 CODE_DIR=$APP_DIR/libench
 BUILD_DIR=$CODE_DIR/build
 
+COMPILER_STRING=$(gcc --version | head -1)
+VERSION_STRING=$(git rev-parse HEAD)
+MACHINE_STRING=$(uname  -r -v -m -p -i -o)
+
 # build libench
 
 git clone --recurse-submodules $CODE_REPO $CODE_DIR
@@ -36,7 +40,8 @@ aws s3 sync $IMAGES_S3_BUCKET .
 # run benchmark
 
 cd $CODE_DIR
-python3 src/main/python/make_page.py $IMAGES_DIR/manifest.json $BUILD_DIR/www
+python3 src/main/python/make_page.py $IMAGES_DIR --build_path $BUILD_DIR/www \
+  --version "$VERSION_STRING" --machine "$MACHINE_STRING" --compiler "$COMPILER_STRING"
 
 # upload website
 
diff --git a/script/run.sh b/script/run.sh
diff --git a/src/main/python/make_page.py b/src/main/python/make_page.py
@@ -210,7 +210,7 @@ def run_perf_tests(root_path: str, bin_path: str) -> typing.List[Result]:
 
         except (json.decoder.JSONDecodeError, subprocess.CalledProcessError):
           print("x", end="")
-          #raise
+          raise
 
       print()
 
