diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt index 333b88b3d23969..bf604d480afb19 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -126,7 +126,30 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) endfunction() + + function(add_zlib) + if(NOT WIN32) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-all") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-all") + endif() + set(BUILD_SHARED_LIBS OFF) + add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) + set_target_properties(zlib PROPERTIES FOLDER thirdparty) + endfunction() + + function(add_cnpy) + if(NOT WIN32) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-all") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-all") + endif() + set(BUILD_SHARED_LIBS OFF) + add_subdirectory(thirdparty/cnpy EXCLUDE_FROM_ALL) + set_target_properties(cnpy PROPERTIES FOLDER thirdparty) + endfunction() + add_gflags() + add_zlib() + add_cnpy() endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/inference-engine/samples/speech_sample/CMakeLists.txt b/inference-engine/samples/speech_sample/CMakeLists.txt index 0a73e4a2e76d2d..f2ba4756c9f300 100644 --- a/inference-engine/samples/speech_sample/CMakeLists.txt +++ b/inference-engine/samples/speech_sample/CMakeLists.txt @@ -2,10 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cnpy") - add_subdirectory(cnpy) -endif() - file (GLOB SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp file (GLOB HDR ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp) ${CMAKE_CURRENT_SOURCE_DIR}/*.h) diff --git a/inference-engine/samples/speech_sample/fileutils.cpp b/inference-engine/samples/speech_sample/fileutils.cpp index b5562b6cf7834f..854f2b7c362e6e 100644 --- a/inference-engine/samples/speech_sample/fileutils.cpp +++ b/inference-engine/samples/speech_sample/fileutils.cpp @@ -2,20 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // -#include -#include - -#include -#include - #include "fileutils.hpp" -#include "cnpy/cnpy.h" - -void ArkFile::GetFileInfo(const char* fileName, - uint32_t numArrayToFindSize, - uint32_t* ptrNumArrays, - uint32_t* ptrNumMemoryBytes) { +void ArkFile::GetFileInfo(const char* fileName, uint32_t numArrayToFindSize, uint32_t* ptrNumArrays, uint32_t* ptrNumMemoryBytes) { uint32_t numArrays = 0; uint32_t numMemoryBytes = 0; @@ -30,10 +19,10 @@ void ArkFile::GetFileInfo(const char* fileName, break; } in_file.read(reinterpret_cast(&numRows), sizeof(uint32_t)); // read number of rows - std::getline(in_file, line, '\4'); // read control-D + std::getline(in_file, line, '\4'); // read control-D in_file.read(reinterpret_cast(&numCols), sizeof(uint32_t)); // read number of columns num_bytes = numRows * numCols * sizeof(float); - in_file.seekg(num_bytes, in_file.cur); // read data + in_file.seekg(num_bytes, in_file.cur); // read data if (numArrays == numArrayToFindSize) { numMemoryBytes += num_bytes; @@ -41,19 +30,19 @@ void ArkFile::GetFileInfo(const char* fileName, numArrays++; } in_file.close(); - } - else { + } else { fprintf(stderr, "Failed to open %s for reading in GetKaldiArkInfo()!\n", fileName); exit(-1); } - if (ptrNumArrays != NULL) *ptrNumArrays = numArrays; - if (ptrNumMemoryBytes != NULL) *ptrNumMemoryBytes = numMemoryBytes; + if (ptrNumArrays != NULL) + *ptrNumArrays = numArrays; + if (ptrNumMemoryBytes != NULL) + *ptrNumMemoryBytes = numMemoryBytes; } - -void ArkFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, - uint32_t* ptrNumRows, uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement) { +void ArkFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, uint32_t* ptrNumRows, + uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement) { std::ifstream in_file(fileName, std::ios::binary); if (in_file.good()) { uint32_t i = 0; @@ -65,29 +54,28 @@ void ArkFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& p if (line.compare("BFM ") != 0) { break; } - in_file.read(reinterpret_cast(&numRows), sizeof(uint32_t)); // read number of rows - std::getline(in_file, line, '\4'); // read control-D - in_file.read(reinterpret_cast(&numCols), sizeof(uint32_t)); // read number of columns - in_file.seekg(numRows * numCols * sizeof(float), in_file.cur); // read data + in_file.read(reinterpret_cast(&numRows), sizeof(uint32_t)); // read number of rows + std::getline(in_file, line, '\4'); // read control-D + in_file.read(reinterpret_cast(&numCols), sizeof(uint32_t)); // read number of columns + in_file.seekg(numRows * numCols * sizeof(float), in_file.cur); // read data i++; } if (!in_file.eof()) { std::string line; - std::getline(in_file, ptrName, '\0'); // read variable length name followed by space and NUL - std::getline(in_file, line, '\4'); // read "BFM" followed by space and control-D + std::getline(in_file, ptrName, '\0'); // read variable length name followed by space and NUL + std::getline(in_file, line, '\4'); // read "BFM" followed by space and control-D if (line.compare("BFM ") != 0) { fprintf(stderr, "Cannot find array specifier in file %s in LoadKaldiArkArray()!\n", fileName); exit(-1); } - in_file.read(reinterpret_cast(ptrNumRows), sizeof(uint32_t)); // read number of rows - std::getline(in_file, line, '\4'); // read control-D - in_file.read(reinterpret_cast(ptrNumColumns), sizeof(uint32_t)); // read number of columns + in_file.read(reinterpret_cast(ptrNumRows), sizeof(uint32_t)); // read number of rows + std::getline(in_file, line, '\4'); // read control-D + in_file.read(reinterpret_cast(ptrNumColumns), sizeof(uint32_t)); // read number of columns in_file.read(reinterpret_cast(&memory.front()), - *ptrNumRows * *ptrNumColumns * sizeof(float)); // read array data + *ptrNumRows * *ptrNumColumns * sizeof(float)); // read array data } in_file.close(); - } - else { + } else { fprintf(stderr, "Failed to open %s for reading in GetKaldiArkInfo()!\n", fileName); exit(-1); } @@ -95,13 +83,7 @@ void ArkFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& p *ptrNumBytesPerElement = sizeof(float); } - -void ArkFile::SaveFile(const char* fileName, - bool shouldAppend, - std::string name, - void* ptrMemory, - uint32_t numRows, - uint32_t numColumns) { +void ArkFile::SaveFile(const char* fileName, bool shouldAppend, std::string name, void* ptrMemory, uint32_t numRows, uint32_t numColumns) { std::ios_base::openmode mode = std::ios::binary; if (shouldAppend) { mode |= std::ios::app; @@ -117,17 +99,12 @@ void ArkFile::SaveFile(const char* fileName, out_file.write(reinterpret_cast(&numColumns), sizeof(uint32_t)); out_file.write(reinterpret_cast(ptrMemory), numRows * numColumns * sizeof(float)); out_file.close(); - } - else { + } else { throw std::runtime_error(std::string("Failed to open %s for writing in SaveKaldiArkArray()!\n") + fileName); } } - -void NumpyFile::GetFileInfo(const char* fileName, - uint32_t numArrayToFindSize, - uint32_t* ptrNumArrays, - uint32_t* ptrNumMemoryBytes) { +void NumpyFile::GetFileInfo(const char* fileName, uint32_t numArrayToFindSize, uint32_t* ptrNumArrays, uint32_t* ptrNumMemoryBytes) { uint32_t numArrays = 0; uint32_t numMemoryBytes = 0; @@ -139,37 +116,32 @@ void NumpyFile::GetFileInfo(const char* fileName, cnpy::NpyArray my_npy = it->second; numMemoryBytes = my_npy.data_holder->size(); - if (ptrNumArrays != NULL) *ptrNumArrays = numArrays; - if (ptrNumMemoryBytes != NULL) *ptrNumMemoryBytes = numMemoryBytes; + if (ptrNumArrays != NULL) + *ptrNumArrays = numArrays; + if (ptrNumMemoryBytes != NULL) + *ptrNumMemoryBytes = numMemoryBytes; } - -void NumpyFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, - uint32_t* ptrNumRows, uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement) { +void NumpyFile::LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, uint32_t* ptrNumRows, + uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement) { cnpy::npz_t my_npz1 = cnpy::npz_load(fileName); auto it = my_npz1.begin(); std::advance(it, arrayIndex); ptrName = it->first; cnpy::NpyArray my_npy = it->second; - *ptrNumRows = my_npy.shape[0]; - *ptrNumColumns = my_npy.shape[1]; + *ptrNumRows = my_npy.shape[0]; + *ptrNumColumns = my_npy.shape[1]; + + for (size_t i = 0; i < my_npy.data_holder->size(); i++) { + memory.at(i) = my_npy.data_holder->at(i); + } - for (int i = 0; i < my_npy.data_holder->size(); i++) { - memory.at(i) = my_npy.data_holder->at(i); - } - *ptrNumBytesPerElement = sizeof(float); } - -void NumpyFile::SaveFile(const char* fileName, - bool shouldAppend, - std::string name, - void* ptrMemory, - uint32_t numRows, - uint32_t numColumns) { +void NumpyFile::SaveFile(const char* fileName, bool shouldAppend, std::string name, void* ptrMemory, uint32_t numRows, uint32_t numColumns) { std::string mode; shouldAppend ? mode = "a" : mode = "w"; - std::vector shape{ numRows , numColumns }; + std::vector shape {numRows, numColumns}; cnpy::npz_save(fileName, name, reinterpret_cast(ptrMemory), shape, mode); } diff --git a/inference-engine/samples/speech_sample/fileutils.hpp b/inference-engine/samples/speech_sample/fileutils.hpp index c9d0ffeb2f537a..4bf6da5a6b8ee3 100644 --- a/inference-engine/samples/speech_sample/fileutils.hpp +++ b/inference-engine/samples/speech_sample/fileutils.hpp @@ -3,37 +3,24 @@ // #pragma once +#include -class BaseFile { +#include +#include +class BaseFile { public: - virtual void LoadFile(const char* fileName, - uint32_t arrayIndex, - std::string& ptrName, - std::vector& memory, - uint32_t* ptrNumRows, - uint32_t* ptrNumColumns, - uint32_t* ptrNumBytesPerElement)= 0; - - virtual void SaveFile(const char* fileName, - bool shouldAppend, - std::string name, - void* ptrMemory, - uint32_t numRows, - uint32_t numColumns)= 0; - + virtual void LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, uint32_t* ptrNumRows, + uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement) = 0; - virtual void GetFileInfo(const char* fileName, - uint32_t numArrayToFindSize, - uint32_t* ptrNumArrays, - uint32_t* ptrNumMemoryBytes)= 0; + virtual void SaveFile(const char* fileName, bool shouldAppend, std::string name, void* ptrMemory, uint32_t numRows, uint32_t numColumns) = 0; + virtual void GetFileInfo(const char* fileName, uint32_t numArrayToFindSize, uint32_t* ptrNumArrays, uint32_t* ptrNumMemoryBytes) = 0; }; class ArkFile : public BaseFile { - public: - /** + /** * @brief Get info from Kaldi ARK speech feature vector file * @param fileName .ark file name * @param numArrayToFindSize number speech feature vectors in the file @@ -41,14 +28,9 @@ class ArkFile : public BaseFile { * @param ptrNumMemoryBytes pointer to specific number of memory bytes * @return none. */ - virtual void GetFileInfo(const char* fileName, - uint32_t numArrayToFindSize, - uint32_t* ptrNumArrays, - uint32_t* ptrNumMemoryBytes); - - + virtual void GetFileInfo(const char* fileName, uint32_t numArrayToFindSize, uint32_t* ptrNumArrays, uint32_t* ptrNumMemoryBytes); - /** + /** * @brief Load Kaldi ARK speech feature vector file * @param fileName .ark file name * @param arrayIndex number speech feature vector in the file @@ -59,16 +41,10 @@ class ArkFile : public BaseFile { * @param ptrNumBytesPerElement pointer to number bytes per element (size of float by default) * @return none. */ - void LoadFile(const char* fileName, - uint32_t arrayIndex, - std::string& ptrName, - std::vector& memory, - uint32_t* ptrNumRows, - uint32_t* ptrNumColumns, - uint32_t* ptrNumBytesPerElement); + virtual void LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, uint32_t* ptrNumRows, + uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement); - - /** + /** * @brief Save Kaldi ARK speech feature vector file * @param fileName .ark file name * @param shouldAppend bool flag to rewrite or add to the end of file @@ -78,40 +54,15 @@ class ArkFile : public BaseFile { * @param numColumns number of columns * @return none. */ - void SaveFile(const char* fileName, - bool shouldAppend, - std::string name, - void* ptrMemory, - uint32_t numRows, - uint32_t numColumns); - + virtual void SaveFile(const char* fileName, bool shouldAppend, std::string name, void* ptrMemory, uint32_t numRows, uint32_t numColumns); }; - class NumpyFile : public BaseFile { - public: - - void GetFileInfo(const char* fileName, - uint32_t numArrayToFindSize, - uint32_t* ptrNumArrays, - uint32_t* ptrNumMemoryBytes); - - - void LoadFile(const char* fileName, - uint32_t arrayIndex, - std::string& ptrName, - std::vector& memory, - uint32_t* ptrNumRows, - uint32_t* ptrNumColumns, - uint32_t* ptrNumBytesPerElement); - + virtual void GetFileInfo(const char* fileName, uint32_t numArrayToFindSize, uint32_t* ptrNumArrays, uint32_t* ptrNumMemoryBytes); - void SaveFile(const char* fileName, - bool shouldAppend, - std::string name, - void* ptrMemory, - uint32_t numRows, - uint32_t numColumns); + virtual void LoadFile(const char* fileName, uint32_t arrayIndex, std::string& ptrName, std::vector& memory, uint32_t* ptrNumRows, + uint32_t* ptrNumColumns, uint32_t* ptrNumBytesPerElement); + virtual void SaveFile(const char* fileName, bool shouldAppend, std::string name, void* ptrMemory, uint32_t numRows, uint32_t numColumns); }; diff --git a/inference-engine/samples/speech_sample/main.cpp b/inference-engine/samples/speech_sample/main.cpp index 7f5c2c40a6dd56..1b67ad6170b653 100644 --- a/inference-engine/samples/speech_sample/main.cpp +++ b/inference-engine/samples/speech_sample/main.cpp @@ -24,8 +24,8 @@ #include #include -#include "speech_sample.hpp" #include "fileutils.hpp" +#include "speech_sample.hpp" #define MAX_SCORE_DIFFERENCE 0.0001f // max score difference for frame error threshold #define MAX_VAL_2B_FEAT 16384 // max to find scale factor @@ -506,32 +506,16 @@ int main(int argc, char* argv[]) { } BaseFile* file; - BaseFile* fileReferenceScores; BaseFile* fileOutput; auto extInputFile = fileExt(FLAGS_i); if (extInputFile == "ark") { file = new ArkFile(); - } - else if (extInputFile == "npz") { + } else if (extInputFile == "npz") { file = new NumpyFile(); - } - else { + } else { throw std::logic_error("Invalid input file"); } - if (!FLAGS_r.empty()) { - auto exReferenceScoresFile = fileExt(FLAGS_r); - if (exReferenceScoresFile == "ark") { - fileReferenceScores = new ArkFile(); - } - else if (exReferenceScoresFile == "npz") { - fileReferenceScores = new NumpyFile(); - } - else { - throw std::logic_error("Invalid Reference Scores file"); - } - } - std::vector inputFiles; std::vector numBytesThisUtterance; uint32_t numUtterances(0); @@ -865,7 +849,7 @@ int main(int argc, char* argv[]) { file->GetFileInfo(inputFilename, utteranceIndex, &n, &numBytesThisUtterance[i]); ptrUtterance.resize(numBytesThisUtterance[i]); file->LoadFile(inputFilename, utteranceIndex, uttName, ptrUtterance, ¤tNumFrames, ¤tNumFrameElementsInput, - ¤tNumBytesPerElementInput); + ¤tNumBytesPerElementInput); if (numFrames == 0) { numFrames = currentNumFrames; } else if (numFrames != currentNumFrames) { @@ -889,11 +873,20 @@ int main(int argc, char* argv[]) { ptrScores.resize(numFrames * numScoresPerFrame * sizeof(float)); if (!FLAGS_r.empty()) { /** Read file with reference scores **/ + BaseFile* fileReferenceScores; + auto exReferenceScoresFile = fileExt(FLAGS_r); + if (exReferenceScoresFile == "ark") { + fileReferenceScores = new ArkFile(); + } else if (exReferenceScoresFile == "npz") { + fileReferenceScores = new NumpyFile(); + } else { + throw std::logic_error("Invalid Reference Scores file"); + } std::string refUtteranceName; fileReferenceScores->GetFileInfo(reference_name_files[next_output].c_str(), utteranceIndex, &n, &numBytesReferenceScoreThisUtterance); ptrReferenceScores.resize(numBytesReferenceScoreThisUtterance); - fileReferenceScores->LoadFile(reference_name_files[next_output].c_str(), utteranceIndex, refUtteranceName, ptrReferenceScores, &numFramesReference, - &numFrameElementsReference, &numBytesPerElementReference); + fileReferenceScores->LoadFile(reference_name_files[next_output].c_str(), utteranceIndex, refUtteranceName, ptrReferenceScores, + &numFramesReference, &numFrameElementsReference, &numBytesPerElementReference); } double totalTime = 0.0; @@ -1084,11 +1077,9 @@ int main(int argc, char* argv[]) { auto exOutputScoresFile = fileExt(FLAGS_o); if (exOutputScoresFile == "ark") { fileOutput = new ArkFile(); - } - else if (exOutputScoresFile == "npz") { + } else if (exOutputScoresFile == "npz") { fileOutput = new NumpyFile(); - } - else { + } else { throw std::logic_error("Invalid Reference Scores file"); } /* Save output data to file */ diff --git a/inference-engine/samples/thirdparty/cnpy/CMakeLists.txt b/inference-engine/samples/thirdparty/cnpy/CMakeLists.txt index a688420109ebe1..db89fd3f365d93 100644 --- a/inference-engine/samples/thirdparty/cnpy/CMakeLists.txt +++ b/inference-engine/samples/thirdparty/cnpy/CMakeLists.txt @@ -10,8 +10,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_library(cnpy STATIC "cnpy.cpp") target_link_libraries(${TARGET_NAME} PUBLIC zlib) -target_include_directories(${TARGET_NAME} PUBLIC "cnpy.h" "${CMAKE_CURRENT_SOURCE_DIR}/..") +target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/..") -if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) -endif() diff --git a/inference-engine/samples/thirdparty/cnpy/cnpy.cpp b/inference-engine/samples/thirdparty/cnpy/cnpy.cpp index 23378676034b55..c1ef2acd78877e 100644 --- a/inference-engine/samples/thirdparty/cnpy/cnpy.cpp +++ b/inference-engine/samples/thirdparty/cnpy/cnpy.cpp @@ -103,10 +103,10 @@ void cnpy::parse_npy_header(unsigned char* buffer,size_t& word_size, std::vector void cnpy::parse_npy_header(FILE* fp, size_t& word_size, std::vector& shape, bool& fortran_order) { char buffer[256]; - size_t res = fread(buffer,sizeof(char),11,fp); - if(res != 11) + size_t res = fread(buffer,sizeof(char),11,fp); + if (res != 11) throw std::runtime_error("parse_npy_header: failed fread"); - std::string header = fgets(buffer,256,fp); + std::string header = (fgets(buffer,256,fp) != NULL) ? fgets(buffer, 256, fp) : ""; assert(header[header.size()-1] == '\n'); size_t loc1, loc2; @@ -177,7 +177,7 @@ void cnpy::parse_zip_footer(FILE* fp, uint16_t& nrecs, size_t& global_header_siz cnpy::NpyArray load_the_npy_file(FILE* fp) { std::vector shape; - size_t word_size; + size_t word_size = 0; bool fortran_order; cnpy::parse_npy_header(fp,word_size,shape,fortran_order); @@ -293,9 +293,11 @@ cnpy::NpyArray cnpy::npz_load(std::string fname, std::string varname) { //read in the variable name uint16_t name_len = *(uint16_t*) &local_header[26]; std::string vname(name_len,' '); - size_t vname_res = fread(&vname[0],sizeof(char),name_len,fp); - if(vname_res != name_len) + size_t vname_res = fread(&vname[0],sizeof(char),name_len,fp); + if (vname_res != name_len) { + fclose(fp); throw std::runtime_error("npz_load: failed fread"); + } vname.erase(vname.end()-4,vname.end()); //erase the lagging .npy //read in the extra field diff --git a/inference-engine/samples/thirdparty/cnpy/cnpy.h b/inference-engine/samples/thirdparty/cnpy/cnpy.h index 69db54abc22944..f03940f9be6fea 100644 --- a/inference-engine/samples/thirdparty/cnpy/cnpy.h +++ b/inference-engine/samples/thirdparty/cnpy/cnpy.h @@ -154,6 +154,7 @@ namespace cnpy { global_header.resize(global_header_size); size_t res = fread(&global_header[0],sizeof(char),global_header_size,fp); if(res != global_header_size){ + fclose(fp); throw std::runtime_error("npz_save: header read error while adding to existing zip"); } fseek(fp,global_header_offset,SEEK_SET); @@ -212,12 +213,14 @@ namespace cnpy { footer += (uint16_t) 0; //zip file comment length //write everything - fwrite(&local_header[0],sizeof(char),local_header.size(),fp); - fwrite(&npy_header[0],sizeof(char),npy_header.size(),fp); - fwrite(data,sizeof(T),nels,fp); - fwrite(&global_header[0],sizeof(char),global_header.size(),fp); - fwrite(&footer[0],sizeof(char),footer.size(),fp); - fclose(fp); + if (fp) { + fwrite(&local_header[0], sizeof(char), local_header.size(), fp); + fwrite(&npy_header[0], sizeof(char), npy_header.size(), fp); + fwrite(data, sizeof(T), nels, fp); + fwrite(&global_header[0], sizeof(char), global_header.size(), fp); + fwrite(&footer[0], sizeof(char), footer.size(), fp); + fclose(fp); + } } template void npy_save(std::string fname, const std::vector data, std::string mode = "w") { diff --git a/inference-engine/samples/thirdparty/zlib/CMakeLists.txt b/inference-engine/samples/thirdparty/zlib/CMakeLists.txt index 1c603b66e73959..7947329eb85d84 100644 --- a/inference-engine/samples/thirdparty/zlib/CMakeLists.txt +++ b/inference-engine/samples/thirdparty/zlib/CMakeLists.txt @@ -10,7 +10,8 @@ set(lib_ext_hdrs "zlib.h" "zconf.h") add_library(${TARGET_NAME} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs}) -target_include_directories(${TARGET_NAME} PUBLIC "zlib.h" "${CMAKE_CURRENT_SOURCE_DIR}/..") +target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/..") if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3") @@ -22,8 +23,4 @@ if(UNIX) endif() endif() -if(COMMAND add_clang_format_target) - add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) -endif() -