Merge pull request #1588 from Idclip/vdb_ax_bugfix

Fixed incorrect optimization level default in vdb_ax

Author: Idclip

cmake/FindBlosc.cmake

@@ -191,10 +191,12 @@ list(APPEND _BLOSC_LIBRARYDIR_SEARCH_DIRS
 # Library suffix handling
 
 set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
 
 if(MSVC)
   if(BLOSC_USE_STATIC_LIBS)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+    set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
   endif()
 else()
   if(BLOSC_USE_STATIC_LIBS)
@@ -247,7 +249,9 @@ endforeach()
 # Reset library suffix
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES})
 unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
 
 if(Blosc_LIBRARY_DEBUG AND Blosc_LIBRARY_RELEASE)
   # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_fail_1

@@ -1,7 +1,8 @@
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_fail_3

@@ -2,7 +2,8 @@ FATAL: "--invalid-option" is not a valid option
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_pass_1

@@ -1,7 +1,8 @@
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_cmd/vdb_ax/main.cc

@@ -224,7 +224,7 @@ struct ProgOptions
             .addOpt("-h")
             .addOpt("--help")
             .addOpt("-help")
-            .setDoc("print help and exit. [command] -h prints extra information.")
+            .setDoc("print help and exit (use [command] --help for more information).")
             .get();
 
     // Execute options
@@ -287,6 +287,7 @@ struct ProgOptions
                     fatal("invalid option given for --opt level");
                 }
             })
+            .setDefault(openvdb::ax::CompilerOptions::OptLevel::O3)
             .get();
 
     openvdb::ax::cli::Param<size_t> mThreads =
@@ -463,7 +464,8 @@ void shortManPage [[noreturn]] (const ProgOptions& opts, int exitStatus = EXIT_F
     std::cerr <<
     "usage: " << gProgName << " [command] [--help|-h] [-v] [<args>]\n" <<
     '\n' <<
-    "CLI utility for processing OpenVDB data using AX.\n";
+    "CLI utility for processing OpenVDB data using AX.\n" <<
+    "Available [command] modes are: [execute|analyze|functions] (Default: execute).\n";
     openvdb::ax::cli::usage(std::cerr, opts.mHelp.opts(), opts.mHelp.doc(), false);
     openvdb::ax::cli::usage(std::cerr, opts.mVerbose.opts(), opts.mVerbose.doc(), false);
     std::cerr << '\n';

pendingchanges/vdb_ax.txt

@@ -0,0 +1,4 @@
+AX:
+- Bug Fix:
+    Fixed an incorrect option in the `vdb_ax` command line tool where the default
+    optimization level was set to NONE instead of O3 (issue introduced in 10.0.0).