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

---
 Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5c39df1..b686b67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GPU=0
+GPU=1
 CUDNN=0
 CUDNN_HALF=0
 OPENCV=0
@@ -29,8 +29,8 @@
 # GP100/Tesla P100 � DGX-1
 # ARCH= -gencode arch=compute_60,code=sm_60
 
-# For Jetson Tx1 uncomment:
-# ARCH= -gencode arch=compute_51,code=[sm_51,compute_51]
+# For Jetson TX1, Tegra X1, DRIVE CX, DRIVE PX - uncomment:
+# ARCH= -gencode arch=compute_53,code=[sm_53,compute_53]
 
 # For Jetson Tx2 or Drive-PX2 uncomment:
 # ARCH= -gencode arch=compute_62,code=[sm_62,compute_62]
@@ -57,7 +57,7 @@
 OPTS= -O0 -g
 else
 ifeq ($(AVX), 1) 
-CFLAGS+= -ffp-contract=fast -mavx -msse4.1 -msse4a
+CFLAGS+= -ffp-contract=fast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a
 endif
 endif
 

--
Gitblit v1.10.0