From 22da91d7573f2b8e45b3d30cd44e60cafc4cff43 Mon Sep 17 00:00:00 2001
From: "Nallamaddi, Rohith" <rohith.nallamaddi@amd.com>
Date: Wed, 8 Aug 2018 22:16:08 -0700
Subject: [PATCH 1/2] iclude db folder for hipifying

---
 caffe2/db/CMakeLists.txt            | 10 +++++++---
 tools/amd_build/build_caffe2_amd.py |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/caffe2/db/CMakeLists.txt b/caffe2/db/CMakeLists.txt
index e96d6b79165a0b..6be28acc4f2260 100644
--- a/caffe2/db/CMakeLists.txt
+++ b/caffe2/db/CMakeLists.txt
@@ -1,15 +1,17 @@
-set(Caffe2_DB_COMMON_CPU_SRC
+iset(Caffe2_DB_COMMON_CPU_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/create_db_op.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/protodb.cc"
 )
 set(Caffe2_DB_COMMON_GPU_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/create_db_op_gpu.cc"
 )
-
+set(Caffe2_DB_COMMON_HIP_SRC
+    "${CMAKE_CURRENT_SOURCE_DIR}/hip/create_db_op_hip.cc"
+)
 # Common files that are always going to be included.
 list(APPEND Caffe2_CPU_SRCS ${Caffe2_DB_COMMON_CPU_SRC})
 list(APPEND Caffe2_GPU_SRCS ${Caffe2_DB_COMMON_GPU_SRC})
-
+list(APPEND Caffe2_HIP_SRCS ${Caffe2_DB_COMMON_HIP_SRC})
 # DB specific files
 if (USE_LMDB)
   list(APPEND Caffe2_CPU_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/lmdb.cc")
@@ -25,3 +27,5 @@ endif()
 
 set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} PARENT_SCOPE)
 set(Caffe2_GPU_SRCS ${Caffe2_GPU_SRCS} PARENT_SCOPE)
+set(Caffe2_HIP_SRCS ${Caffe2_HIP_SRCS} PARENT_SCOPE)
+
diff --git a/tools/amd_build/build_caffe2_amd.py b/tools/amd_build/build_caffe2_amd.py
index 9726bc2ebed542..10f72d999cd0d3 100755
--- a/tools/amd_build/build_caffe2_amd.py
+++ b/tools/amd_build/build_caffe2_amd.py
@@ -17,6 +17,7 @@
     "caffe2/queue/*",
     "caffe2/**/*_test*",
     "caffe2/core/THCCachingAllocator*",
+    "caffe2/db/*",
 ]
 
 ignores = [

From f180f9f519bb00dbce9b8095d2c00a3b4f96cee3 Mon Sep 17 00:00:00 2001
From: "Nallamaddi, Rohith" <rohith.nallamaddi@amd.com>
Date: Wed, 8 Aug 2018 22:18:36 -0700
Subject: [PATCH 2/2] fix typo

---
 caffe2/db/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/caffe2/db/CMakeLists.txt b/caffe2/db/CMakeLists.txt
index 6be28acc4f2260..e9f4272a35b401 100644
--- a/caffe2/db/CMakeLists.txt
+++ b/caffe2/db/CMakeLists.txt
@@ -1,4 +1,4 @@
-iset(Caffe2_DB_COMMON_CPU_SRC
+set(Caffe2_DB_COMMON_CPU_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/create_db_op.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/protodb.cc"
 )