From b1a99f27c796c19544d78d5b712065815aaf2322 Mon Sep 17 00:00:00 2001
From: Alexandre Eichenberger <alexe@us.ibm.com>
Date: Wed, 16 Nov 2022 17:27:46 -0500
Subject: [PATCH] fixes for mac (#1863)

Template keyword for Mac clang compiler.

Signed-off-by: Alexandre Eichenberger <alexe@us.ibm.com>
---
 .../ONNXToKrnl/ONNXToKrnlCommon.hpp           |  2 +-
 src/Dialect/Krnl/DialectBuilder.cpp           |  8 +++++--
 src/Dialect/Krnl/DialectBuilder.hpp           |  4 ++--
 src/Dialect/Mlir/DialectBuilder.hpp           | 14 ++++++-------
 src/Dialect/Mlir/DialectBuilder.hpp.inc       | 21 ++++++++++++-------
 src/Dialect/Mlir/IndexExprBuilder.hpp         |  2 +-
 src/Dialect/ONNX/DialectBuilder.hpp           |  4 ++--
 test/modellib/ModelLib.hpp                    |  6 +++---
 8 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/Conversion/ONNXToKrnl/ONNXToKrnlCommon.hpp b/src/Conversion/ONNXToKrnl/ONNXToKrnlCommon.hpp
index a273fdcc81..606e2929d8 100644
--- a/src/Conversion/ONNXToKrnl/ONNXToKrnlCommon.hpp
+++ b/src/Conversion/ONNXToKrnl/ONNXToKrnlCommon.hpp
@@ -58,7 +58,7 @@ struct OnnxToKrnlBuilder : public OnnxBuilder {
   OnnxToKrnlBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : OnnxBuilder(b, loc) {}
   OnnxToKrnlBuilder(DialectBuilder &db) : OnnxBuilder(db) {}
-  ~OnnxToKrnlBuilder() {}
+  virtual ~OnnxToKrnlBuilder() {}
 
   // Generate an 'onnx.reshape' operation on the 'input' tensor, the new shape
   // is provided by 'shapeDims'.
diff --git a/src/Dialect/Krnl/DialectBuilder.cpp b/src/Dialect/Krnl/DialectBuilder.cpp
index 4738ead122..afa2cec2ce 100644
--- a/src/Dialect/Krnl/DialectBuilder.cpp
+++ b/src/Dialect/Krnl/DialectBuilder.cpp
@@ -107,7 +107,9 @@ Value KrnlBuilder::vectorTypeCast(Value sourceMemref, int64_t vectorLen) const {
 }
 
 ValueRange KrnlBuilder::defineLoops(int64_t originalLoopNum) const {
-  return b().create<KrnlDefineLoopsOp>(loc(), originalLoopNum).getResults();
+  return b()
+      .template create<KrnlDefineLoopsOp>(loc(), originalLoopNum)
+      .getResults();
 }
 
 ValueRange KrnlBuilder::block(Value loop, int64_t blockSize) const {
@@ -119,7 +121,9 @@ void KrnlBuilder::permute(ValueRange loops, ArrayRef<int64_t> map) const {
 }
 
 ValueRange KrnlBuilder::getInductionVarValue(ValueRange loops) const {
-  return b().create<KrnlGetInductionVariableValueOp>(loc(), loops).getResults();
+  return b()
+      .template create<KrnlGetInductionVariableValueOp>(loc(), loops)
+      .getResults();
 }
 
 void KrnlBuilder::iterate(ValueRange originalLoops, ValueRange optimizedLoops,
diff --git a/src/Dialect/Krnl/DialectBuilder.hpp b/src/Dialect/Krnl/DialectBuilder.hpp
index 241af62308..d184a071c1 100644
--- a/src/Dialect/Krnl/DialectBuilder.hpp
+++ b/src/Dialect/Krnl/DialectBuilder.hpp
@@ -27,7 +27,7 @@ struct KrnlBuilder : public DialectBuilder {
   KrnlBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   KrnlBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~KrnlBuilder() {}
+  virtual ~KrnlBuilder() {}
 
   mlir::Value load(mlir::Value memref, mlir::ValueRange indices = {}) const;
   // When ranks of offsets<indices, add offsets to the least significant dims.
@@ -176,7 +176,7 @@ struct IndexExprBuilderForKrnl : IndexExprBuilder {
   IndexExprBuilderForKrnl(mlir::OpBuilder &b, mlir::Location loc)
       : IndexExprBuilder(b, loc) {}
   IndexExprBuilderForKrnl(const DialectBuilder &db) : IndexExprBuilder(db) {}
-  ~IndexExprBuilderForKrnl() {}
+  virtual ~IndexExprBuilderForKrnl() {}
 
 protected:
   mlir::DenseElementsAttr getConst(mlir::Value value) final;
diff --git a/src/Dialect/Mlir/DialectBuilder.hpp b/src/Dialect/Mlir/DialectBuilder.hpp
index f9c0c323cf..c363c7b1f9 100644
--- a/src/Dialect/Mlir/DialectBuilder.hpp
+++ b/src/Dialect/Mlir/DialectBuilder.hpp
@@ -31,7 +31,7 @@ struct DialectBuilder {
       : builder(&b), location(loc) {}
   DialectBuilder(const DialectBuilder &db)
       : builder(db.builder), location(db.location) {}
-  ~DialectBuilder() {}
+  virtual ~DialectBuilder() {}
   DialectBuilder(DialectBuilder &&) = delete;
   DialectBuilder &operator=(const DialectBuilder &) = delete;
   DialectBuilder &&operator=(const DialectBuilder &&) = delete;
@@ -77,7 +77,7 @@ struct MathBuilder final : DialectBuilder {
   MathBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   MathBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~MathBuilder() {}
+  virtual ~MathBuilder() {}
 
   mlir::Value abs(mlir::Value val) const;
 
@@ -150,7 +150,7 @@ struct MemRefBuilder final : DialectBuilder {
   MemRefBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   MemRefBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~MemRefBuilder() {}
+  virtual ~MemRefBuilder() {}
 
   mlir::memref::AllocOp alloc(mlir::MemRefType type) const;
   mlir::memref::AllocOp alloc(
@@ -191,7 +191,7 @@ struct SCFBuilder final : DialectBuilder {
   SCFBuilder(mlir::Location loc) : DialectBuilder(loc) {}
   SCFBuilder(mlir::OpBuilder &b, mlir::Location loc) : DialectBuilder(b, loc) {}
   SCFBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~SCFBuilder() {}
+  virtual ~SCFBuilder() {}
 
   /// Create an if then with optional else. Construct does not generate a result
   /// (unlike some scf::if) and introduces the yields automatically.
@@ -215,7 +215,7 @@ struct VectorBuilder final : DialectBuilder {
   VectorBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   VectorBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~VectorBuilder() {}
+  virtual ~VectorBuilder() {}
 
   // Get the machine SIMD vector length for the given elementary type.
   // This can help guide certain optimizations.
@@ -264,7 +264,7 @@ struct GenericAffineBuilder final : DialectBuilder {
   GenericAffineBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   GenericAffineBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~GenericAffineBuilder() {}
+  virtual ~GenericAffineBuilder() {}
 
   mlir::Value load(mlir::Value memref, mlir::ValueRange indices = {}) const;
   // When ranks of offsets<indices, add offsets to the least significant dims.
@@ -332,7 +332,7 @@ struct LLVMBuilder final : DialectBuilder {
   LLVMBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   LLVMBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~LLVMBuilder() {}
+  virtual ~LLVMBuilder() {}
 
   // AddressOfOp
   mlir::Value addressOf(mlir::LLVM::GlobalOp op) const;
diff --git a/src/Dialect/Mlir/DialectBuilder.hpp.inc b/src/Dialect/Mlir/DialectBuilder.hpp.inc
index 5dc66bfd24..6099dd5725 100644
--- a/src/Dialect/Mlir/DialectBuilder.hpp.inc
+++ b/src/Dialect/Mlir/DialectBuilder.hpp.inc
@@ -1,18 +1,23 @@
 //===---- DialectBuilder.hpp.inc - Helper functions for MLIR dialects -----===//
 //
-// Copyright 2019-2021 The IBM Research Authors.
+// Copyright 2019-2022 The IBM Research Authors.
 //
 // =============================================================================
 //
 // This file contains helper functions for building MLIR operations.
 //
+// Note on usage of template keyword. Since the GenericAffineBuilder is
+// templated, and we use templated functions (such as create<OP>), we must add
+// the "template" keyword before the "create" function to indicate what is being
+// templated.
+//
 //===----------------------------------------------------------------------===//
 
 // Implementation of GenericAffineBuilder
 template <class LOAD_OP, class STORE_OP>
 mlir::Value GenericAffineBuilder<LOAD_OP, STORE_OP>::load(
     mlir::Value memref, mlir::ValueRange indices) const {
-  return b().create<LOAD_OP>(loc(), memref, indices);
+  return b().template create<LOAD_OP>(loc(), memref, indices);
 }
 
 template <class LOAD_OP, class STORE_OP>
@@ -36,7 +41,7 @@ mlir::Value GenericAffineBuilder<LOAD_OP, STORE_OP>::loadIE(mlir::Value memref,
 template <class LOAD_OP, class STORE_OP>
 inline void GenericAffineBuilder<LOAD_OP, STORE_OP>::store(
     mlir::Value val, mlir::Value memref, mlir::ValueRange indices) const {
-  b().create<STORE_OP>(loc(), val, memref, indices);
+  b().template create<STORE_OP>(loc(), val, memref, indices);
 }
 
 template <class LOAD_OP, class STORE_OP>
@@ -70,8 +75,8 @@ inline void GenericAffineBuilder<LOAD_OP, STORE_OP>::forIE(IndexExpr lb,
   lb.getAffineMapAndOperands(lbMap, lbOperands);
   ub.getAffineMapAndOperands(ubMap, ubOperands);
   // Create affine for.
-  b().create<mlir::AffineForOp>(loc(), lbOperands, lbMap, ubOperands, ubMap,
-      step, mlir::ValueRange{},
+  b().template create<mlir::AffineForOp>(loc(), lbOperands, lbMap, ubOperands,
+      ubMap, step, mlir::ValueRange{},
       [&](mlir::OpBuilder &b, mlir::Location loc, mlir::Value index,
           mlir::ValueRange args) {
         GenericAffineBuilder createAffine(b, loc);
@@ -120,8 +125,8 @@ inline void GenericAffineBuilder<LOAD_OP, STORE_OP>::ifThenElse(
       scope.getNumDims(), scope.getNumSymbols(), affineCond, isEq);
   llvm::SmallVector<mlir::Value, 8> dimAndSymbolList;
   scope.getDimAndSymbolList(dimAndSymbolList);
-  auto ifOp =
-      b().create<mlir::AffineIfOp>(loc(), inset, dimAndSymbolList, true);
+  auto ifOp = b().template create<mlir::AffineIfOp>(
+      loc(), inset, dimAndSymbolList, true);
   mlir::Block *thenBlock = ifOp.getThenBlock();
   mlir::Block *elseBlock = ifOp.getElseBlock();
   if (!allFalse) {
@@ -140,7 +145,7 @@ inline void GenericAffineBuilder<LOAD_OP, STORE_OP>::ifThenElse(
 
 template <class LOAD_OP, class STORE_OP>
 inline void GenericAffineBuilder<LOAD_OP, STORE_OP>::yield() const {
-  b().create<mlir::AffineYieldOp>(loc());
+  b().template create<mlir::AffineYieldOp>(loc());
 }
 
 // Support for multiple forIE loops.
diff --git a/src/Dialect/Mlir/IndexExprBuilder.hpp b/src/Dialect/Mlir/IndexExprBuilder.hpp
index a56d9ad533..a8b0c7a949 100644
--- a/src/Dialect/Mlir/IndexExprBuilder.hpp
+++ b/src/Dialect/Mlir/IndexExprBuilder.hpp
@@ -65,7 +65,7 @@ struct IndexExprBuilder : DialectBuilder {
   IndexExprBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   IndexExprBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~IndexExprBuilder() {}
+  virtual ~IndexExprBuilder() {}
 
   using IndexExprList = llvm::SmallVectorImpl<IndexExpr>;
 
diff --git a/src/Dialect/ONNX/DialectBuilder.hpp b/src/Dialect/ONNX/DialectBuilder.hpp
index e7f87a3c4c..a9d2a99e8d 100644
--- a/src/Dialect/ONNX/DialectBuilder.hpp
+++ b/src/Dialect/ONNX/DialectBuilder.hpp
@@ -30,7 +30,7 @@ struct OnnxBuilder : onnx_mlir::DialectBuilder {
   OnnxBuilder(mlir::OpBuilder &b, mlir::Location loc)
       : DialectBuilder(b, loc) {}
   OnnxBuilder(const DialectBuilder &db) : DialectBuilder(db) {}
-  ~OnnxBuilder(){};
+  virtual ~OnnxBuilder(){};
   // ONNXAddOp
   mlir::Value add(mlir::Value A, mlir::Value B) const;
 
@@ -145,7 +145,7 @@ struct IndexExprBuilderForAnalysis : IndexExprBuilder {
       : IndexExprBuilder(b, loc) {}
   IndexExprBuilderForAnalysis(const DialectBuilder &db)
       : IndexExprBuilder(db) {}
-  ~IndexExprBuilderForAnalysis() {}
+  virtual ~IndexExprBuilderForAnalysis() {}
 
 protected:
   mlir::DenseElementsAttr getConst(mlir::Value value) final;
diff --git a/test/modellib/ModelLib.hpp b/test/modellib/ModelLib.hpp
index 6b34eafda0..af14cc65b3 100644
--- a/test/modellib/ModelLib.hpp
+++ b/test/modellib/ModelLib.hpp
@@ -393,7 +393,7 @@ class LSTMLibBuilder : public RNNModelLibBuilder {
       const bool isDynamicB, const bool isNoneH = false,
       const bool isNoneC = false, const bool isNoneP = false,
       const int layout = 0);
-  ~LSTMLibBuilder();
+  virtual ~LSTMLibBuilder();
   bool build() final;
   bool prepareInputs() final;
   bool prepareInputs(float dataRangeLB, float dataRangeUB);
@@ -415,7 +415,7 @@ class GRULibBuilder : public RNNModelLibBuilder {
   GRULibBuilder(const std::string &modelName, const int direction, const int S,
       const int B, const int I, const int H, const int linearBeforeReset,
       const bool isDynamicS, const bool isDynamicB, const int layout = 0);
-  ~GRULibBuilder();
+  virtual ~GRULibBuilder();
   bool build() final;
   bool prepareInputs() final;
   bool prepareInputs(float dataRangeLB, float dataRangeUB);
@@ -436,7 +436,7 @@ class RNNLibBuilder : public RNNModelLibBuilder {
   RNNLibBuilder(const std::string &modelName, const int direction, const int S,
       const int B, const int I, const int H, const bool isDynamicS,
       const bool isDynamicB, const int layout = 0);
-  ~RNNLibBuilder();
+  virtual ~RNNLibBuilder();
   bool build() final;
   bool prepareInputs() final;
   bool prepareInputs(float dataRangeLB, float dataRangeUB);