vec_iree: miscellaneous minor clean-ups Misc minor clean-ups. No algorithm changes. Change-Id: I917dac73bb7f2413069f5082c5875e16643d062a
diff --git a/CMakeLists.txt b/CMakeLists.txt index 223ba47..46f4279 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ if(_AL_IREE_SAMPLES EQUAL 0) string(REPLACE "iree::" "" _AL_IREE_SAMPLES_ALIAS "${library}") string(REPLACE "ALIAS;" "" _AL_IREE_REAL_TARGET "${ARGN}") - # Add an alias target starting with `samples::` + # Add an alias target starting with the iree:: prefix removed _add_library(${_AL_IREE_SAMPLES_ALIAS} ALIAS ${_AL_IREE_REAL_TARGET}) endif() endif()
diff --git a/samples/device/device.h b/samples/device/device.h index 11caf78..ada1330 100644 --- a/samples/device/device.h +++ b/samples/device/device.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_DEVICE_H -#define SAMPLES_DEVICE_H +#ifndef SAMPLES_DEVICE_DEVICE_H_ +#define SAMPLES_DEVICE_DEVICE_H_ #include "iree/base/api.h" #include "iree/hal/api.h" @@ -26,4 +26,4 @@ iree_status_t create_sample_device(iree_allocator_t host_allocator, iree_hal_device_t** out_device); -#endif // SAMPLES_DEVICE_H +#endif // SAMPLES_DEVICE_DEVICE_H_
diff --git a/samples/float_model/mnist.h b/samples/float_model/mnist.h index 717830a..97016b7 100644 --- a/samples/float_model/mnist.h +++ b/samples/float_model/mnist.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_MNIST_H -#define SAMPLES_MNIST_H +#ifndef SAMPLES_FLOAT_MODEL_MNIST_H_ +#define SAMPLES_FLOAT_MODEL_MNIST_H_ #include <stdint.h> @@ -24,4 +24,4 @@ float best_out; } MnistOutput; -#endif +#endif // SAMPLES_FLOAT_MODEL_MNIST_H_
diff --git a/samples/float_model/mobilenet_v1.h b/samples/float_model/mobilenet_v1.h index 18aa922..21a8cb7 100644 --- a/samples/float_model/mobilenet_v1.h +++ b/samples/float_model/mobilenet_v1.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_MOBILENETV1_H -#define SAMPLES_MOBILENETV1_H +#ifndef SAMPLES_FLOAT_MODEL_MOBILENET_V1_H_ +#define SAMPLES_FLOAT_MODEL_MOBILENET_V1_H_ #include <stdint.h> @@ -24,4 +24,4 @@ float best_out; } MobilenetV1Output; -#endif +#endif // SAMPLES_FLOAT_MODEL_MOBILENET_V1_H_
diff --git a/samples/quant_model/daredevil.c b/samples/quant_model/daredevil.c index 178dc7e..df78077 100644 --- a/samples/quant_model/daredevil.c +++ b/samples/quant_model/daredevil.c
@@ -78,8 +78,6 @@ daredevil_quant_input, model->input_size_bytes[0] * model->input_length[0]); - - return iree_ok_status(); }
diff --git a/samples/quant_model/daredevil.h b/samples/quant_model/daredevil.h index fdaf5c8..68f3464 100644 --- a/samples/quant_model/daredevil.h +++ b/samples/quant_model/daredevil.h
@@ -24,4 +24,4 @@ int best_out; } DaredevilOutput; -#endif +#endif // SAMPLES_QUANT_MODEL_DAREDEVIL_H_
diff --git a/samples/quant_model/mobilenet_v1.h b/samples/quant_model/mobilenet_v1.h index d511946..24d0c4e 100644 --- a/samples/quant_model/mobilenet_v1.h +++ b/samples/quant_model/mobilenet_v1.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_MOBILENETV1_H -#define SAMPLES_MOBILENETV1_H +#ifndef SAMPLES_QUANT_MODEL_MOBILENET_V1_H_ +#define SAMPLES_QUANT_MODEL_MOBILENET_V1_H_ #include <stdint.h> @@ -24,4 +24,4 @@ int best_out; } MobilenetV1Output; -#endif +#endif // SAMPLES_QUANT_MODEL_MOBILENET_V1_H_
diff --git a/samples/quant_model/mobilenet_v2.h b/samples/quant_model/mobilenet_v2.h index fdc556a..862fc42 100644 --- a/samples/quant_model/mobilenet_v2.h +++ b/samples/quant_model/mobilenet_v2.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_MOBILENETV2_H -#define SAMPLES_MOBILENETV2_H +#ifndef SAMPLES_QUANT_MODEL_MOBILENET_V2_H_ +#define SAMPLES_QUANT_MODEL_MOBILENET_V2_H_ #include <stdint.h> @@ -24,4 +24,4 @@ int best_out; } MobilenetV2Output; -#endif +#endif // SAMPLES_QUANT_MODEL_MOBILENET_V2_H_
diff --git a/samples/quant_model/person_detection.h b/samples/quant_model/person_detection.h index 9ce1c0d..079094b 100644 --- a/samples/quant_model/person_detection.h +++ b/samples/quant_model/person_detection.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_PERSON_DETECTION_H -#define SAMPLES_PERSON_DETECTION_H +#ifndef SAMPLES_QUANT_MODEL_PERSON_DETECTION_H_ +#define SAMPLES_QUANT_MODEL_PERSON_DETECTION_H_ #include <stdint.h> @@ -24,4 +24,4 @@ int8_t person_score; } PersonDetectionOutput; -#endif +#endif // SAMPLES_QUANT_MODEL_PERSON_DETECTION_H_
diff --git a/samples/risp4ml/common/test_utils.h b/samples/risp4ml/common/test_utils.h index 2c42e8e..3865655 100644 --- a/samples/risp4ml/common/test_utils.h +++ b/samples/risp4ml/common/test_utils.h
@@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef SAMPLES_RISP4ML_COMMON_TEST_UTILS_H_ +#define SAMPLES_RISP4ML_COMMON_TEST_UTILS_H_ + #include <stdio.h> #include <stdlib.h> @@ -56,3 +59,5 @@ } } } + +#endif // SAMPLES_RISP4ML_COMMON_TEST_UTILS_H_
diff --git a/samples/risp4ml/isp_stages/wbg_rvv.c b/samples/risp4ml/isp_stages/wbg_rvv.c index a628f66..6928a0c 100644 --- a/samples/risp4ml/isp_stages/wbg_rvv.c +++ b/samples/risp4ml/isp_stages/wbg_rvv.c
@@ -19,7 +19,6 @@ #include "samples/risp4ml/common/utils.h" #include "samples/risp4ml/isp_stages/wbg.h" -#define kBayerColorChannels 4 #define MAX(a, b) (((a) > (b)) ? (a) : (b)) static const uint16_t kWbgFractional = kRawPipelineFraction;
diff --git a/samples/util/alloc.h b/samples/util/alloc.h index 2423aa4..c92948d 100644 --- a/samples/util/alloc.h +++ b/samples/util/alloc.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SAMPLES_UTIL_ALLOC_H -#define SAMPLES_UTIL_ALLOC_H +#ifndef SAMPLES_UTIL_ALLOC_H_ +#define SAMPLES_UTIL_ALLOC_H_ #include "iree/base/api.h" #include "samples/util/model_api.h" @@ -25,4 +25,4 @@ iree_status_t alloc_input_buffer(const MlModel *model, void **buffer); -#endif // SAMPLES_UTIL_ALLOC_H +#endif // SAMPLES_UTIL_ALLOC_H_
diff --git a/samples/util/model_api.h b/samples/util/model_api.h index 27eeacd..110662d 100644 --- a/samples/util/model_api.h +++ b/samples/util/model_api.h
@@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SW_VEC_IREE_SAMPLES_UTIL_MODEL_API_H_ -#define SW_VEC_IREE_SAMPLES_UTIL_MODEL_API_H_ +#ifndef SAMPLES_UTIL_MODEL_API_H_ +#define SAMPLES_UTIL_MODEL_API_H_ // Define ML model configuration and model-specific utility APIs. @@ -69,4 +69,4 @@ iree_hal_buffer_mapping_t *buffers, MlOutput *output); -#endif // SW_VEC_IREE_SAMPLES_UTIL_MODEL_API_H_ +#endif // SAMPLES_UTIL_MODEL_API_H_
diff --git a/samples/util/util.h b/samples/util/util.h index 71b82b1..b500d02 100644 --- a/samples/util/util.h +++ b/samples/util/util.h
@@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef SW_VEC_IREE_SAMPLES_UTIL_UTIL_H_ -#define SW_VEC_IREE_SAMPLES_UTIL_UTIL_H_ +#ifndef SAMPLES_UTIL_UTIL_H_ +#define SAMPLES_UTIL_UTIL_H_ // A top-level header collection for ML executable utility library. #include "samples/util/alloc.h" #include "samples/util/model_api.h" -#endif // SW_VEC_IREE_SAMPLES_UTIL_UTIL_H_ +#endif // SAMPLES_UTIL_UTIL_H_