diff --git a/cpp/daal/src/data_management/data_conversion_cpu.cpp b/cpp/daal/src/data_management/data_conversion_cpu.cpp
index 0c4bc4778ab..84b73239e91 100755
--- a/cpp/daal/src/data_management/data_conversion_cpu.cpp
+++ b/cpp/daal/src/data_management/data_conversion_cpu.cpp
@@ -26,7 +26,7 @@ namespace data_management
 namespace internal
 {
 /* only for AVX512 architecture with using intrinsics */
-#if defined(__AVX512F__) && defined(DAAL_INTEL_CPP_COMPILER)
+#if defined(__INTEL_COMPILER)
 template <typename T>
 void vectorCopyInternal()
 {
diff --git a/cpp/daal/src/data_management/finiteness_checker.cpp b/cpp/daal/src/data_management/finiteness_checker.cpp
index 5025b2cbb9d..a12e52d5c61 100644
--- a/cpp/daal/src/data_management/finiteness_checker.cpp
+++ b/cpp/daal/src/data_management/finiteness_checker.cpp
@@ -163,7 +163,7 @@ bool checkFinitenessSOA(NumericTable & table, bool allowNaN, services::Status &
     return valuesAreFinite;
 }
 
-#if defined(__AVX512F__) && defined(DAAL_INTEL_CPP_COMPILER)
+#if defined(__INTEL_COMPILER)
 
 const size_t BLOCK_SIZE       = 8192;
 const size_t THREADING_BORDER = 262144;