From eb46166f1130d6c6fb5d41d6090a86b35d1542fc Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Thu, 06 Sep 2018 17:31:12 +0000
Subject: [PATCH] merge resolution

---
 .circleci/config.yml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7434cf9..8a6ebfe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,5 +7,10 @@
     working_directory: ~/work
     steps:
       - checkout
-      - run: make LIBSO=1 GPU=0 CUDNN=0 OPENCV=0 -j 8      
+      - run: make LIBSO=1 GPU=0 CUDNN=0 OPENCV=0 -j 8
+      - run: make clean
+      - run: make LIBSO=1 GPU=0 CUDNN=0 OPENCV=1 -j 8
+      - run: make clean
       - run: make LIBSO=1 GPU=1 CUDNN=1 OPENCV=1 -j 8
+      - run: make clean
+      - run: make LIBSO=1 GPU=1 CUDNN=1 OPENCV=1 CUDNN_HALF=1 -j 8

--
Gitblit v1.10.0