From 5c3995769c6c07d44eec9456b0317627cf38a1b4 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Thu, 3 Nov 2016 04:50:28 -0700
Subject: [PATCH] Improved AVX512 configuration

---
 CMakeLists.txt | 2 +-
 Eigen/Core     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a5ca42bf..f38e22973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ if(NOT MSVC)
 
   option(EIGEN_TEST_AVX512 "Enable/Disable AVX512 in tests/examples" OFF)
   if(EIGEN_TEST_AVX512)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -fabi-version=6" -DEIGEN_ENABLE_AVX512)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -fabi-version=6 -DEIGEN_ENABLE_AVX512")
     message(STATUS "Enabling AVX512 in tests/examples")
   endif()
 
diff --git a/Eigen/Core b/Eigen/Core
index 898a18751..985fea7e7 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -157,7 +157,7 @@
     #ifdef __FMA__
       #define EIGEN_VECTORIZE_FMA
     #endif
-    #ifdef __AVX512F__ && EIGEN_ENABLE_AVX512
+    #if defined(__AVX512F__) && defined(EIGEN_ENABLE_AVX512)
       #define EIGEN_VECTORIZE_AVX512
       #define EIGEN_VECTORIZE_AVX2
       #define EIGEN_VECTORIZE_AVX