moved isMatrix flag

Author: EricBenschneider

src/compiler/utils/CompilerUtils.cpp

@@ -164,8 +164,8 @@ template <> bool CompilerUtils::constantOrDefault<bool>(mlir::Value v, bool d) {
 // Other
 // **************************************************************************************************
 
-[[maybe_unused]] FileMetaData CompilerUtils::getFileMetaData(mlir::Value filename) {
-    return MetaDataParser::readMetaData(constantOrThrow<std::string>(filename));
+[[maybe_unused]] FileMetaData CompilerUtils::getFileMetaData(mlir::Value filename, bool isMatrix) {
+    return MetaDataParser::readMetaData(constantOrThrow<std::string>(filename), ',', isMatrix);
 }
 
 bool CompilerUtils::isMatrixComputation(mlir::Operation *v) {

src/compiler/utils/CompilerUtils.h

@@ -116,7 +116,7 @@ struct CompilerUtils {
      */
     template <typename T> static T constantOrDefault(mlir::Value v, T d);
 
-    [[maybe_unused]] static FileMetaData getFileMetaData(mlir::Value filename);
+    [[maybe_unused]] static FileMetaData getFileMetaData(mlir::Value filename, bool isMatrix = false);
 
     /**
      * @brief Produces a string containing the C++ type name of the

src/parser/metadata/MetaDataParser.cpp

@@ -22,14 +22,14 @@
 #include <fstream>
 #include <iostream>
 
-FileMetaData MetaDataParser::readMetaData(const std::string &filename_, char delim, size_t sampleRows) {
+FileMetaData MetaDataParser::readMetaData(const std::string &filename_, char delim, bool isMatrix, size_t sampleRows) {
     std::string metaFilename = filename_ + ".meta";
     std::ifstream ifs(metaFilename, std::ios::in);
     if (!ifs.good()) {
         int extv = extValue(&filename_[0]);
         // TODO: Support other file types than csv for metadata generation
         if (extv == 0) {
-            FileMetaData fmd = generateFileMetaData(filename_, delim, sampleRows);
+            FileMetaData fmd = generateFileMetaData(filename_, delim, sampleRows, isMatrix);
             try {
                 writeMetaData(filename_, fmd);
             } catch (std::exception &e) {

src/parser/metadata/MetaDataParser.h

@@ -66,7 +66,8 @@ class MetaDataParser {
      * @throws std::invalid_argument Thrown if the JSON file contains any
      * unexpected keys or if the file doesn't contain all the metadata.
      */
-    static FileMetaData readMetaData(const std::string &filename, char delim = ',', size_t sampleRows = std::numeric_limits<size_t>::max());
+    static FileMetaData readMetaData(const std::string &filename, char delim = ',', bool isMatrix = false,
+                                     size_t sampleRows = std::numeric_limits<size_t>::max());
     static FileMetaData readMetaDataFromString(const std::string &str);
     /**
      * @brief Saves the file meta data to the specified file.