Skip to content

Commit 96cae21

Browse files
author
Kent Knox
committed
Commenting out further #pragma warning messages
Changing default for 'keeping kernel sources' to ON to fix unit test failures on CPU devices
1 parent e0df18b commit 96cae21

32 files changed

+50
-50
lines changed

‎src/library/CMakeLists.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# ########################################################################
22
# Copyright 2013 Advanced Micro Devices, Inc.
3-
#
3+
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
7-
#
7+
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
9+
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -99,7 +99,7 @@ set_property( CACHE AUTOGEMM_ARCHITECTURE PROPERTY STRINGS "Hawaii" "Fiji" )
9999
# opencl compiler version
100100
#set( PRECOMPILE_GEMM_OPENCL_VERSION "2.0" CACHE STRING "OpenCL compiler version supported by device driver." )
101101
#set_property( CACHE PRECOMPILE_GEMM_OPENCL_VERSION PROPERTY STRINGS 2.0 1.2 1.1 )
102-
#message( STATUS "AutoGemm PreCompiler will use OpenCL ${PRECOMPILE_GEMM_OPENCL_VERSION} compiler." )
102+
#message( STATUS "AutoGemm PreCompiler will use OpenCL ${PRECOMPILE_GEMM_OPENCL_VERSION} compiler." )
103103

104104
# PreCompile precision selected?
105105
set( PRECOMPILE_GEMM_PRECISION_SELECTED OFF)
@@ -554,8 +554,8 @@ set(SRC_CL_TEMPLATES_GEN
554554
dtrsm_gpu192.clHawaii_64.bin.cl
555555
dgemm_hawaiiChannelConfilct.clHawaii_64.bin.cl
556556
dgemm_hawaiiSplitKernel.clHawaii_64.bin.cl
557-
sgemm_hawaiiSplitKernel.clHawaii_64.bin.cl
558-
sgemm_hawaiiSplitKernel.clBonaire_64.bin.cl
557+
sgemm_hawaiiSplitKernel.clHawaii_64.bin.cl
558+
sgemm_hawaiiSplitKernel.clBonaire_64.bin.cl
559559
dgemm_hawai.clTahiti_64.bin.cl
560560
dtrsm_gpu.clTahiti_64.bin.cl
561561
dgemm_gcn_SmallMatrices.clHawaii_64.bin.cl
@@ -628,7 +628,7 @@ set(CLBLAS_SOURCES
628628
)
629629
set(GLOBAL_HEADERS
630630
${clBLAS_SOURCE_DIR}/clBLAS.h
631-
${clBLAS_SOURCE_DIR}/clBLAS-complex.h
631+
${clBLAS_SOURCE_DIR}/clBLAS-complex.h
632632
${clBLAS_SOURCE_DIR}/include/clkern.h
633633
${clBLAS_SOURCE_DIR}/include/cltypes.h
634634
${clBLAS_SOURCE_DIR}/include/dblock_kgen.h
@@ -673,7 +673,7 @@ if( BLAS_DUMP_CLBLAS_KERNELS )
673673
add_definitions( -DDUMP_CLBLAS_KERNELS )
674674
endif()
675675

676-
option( BLAS_KEEP_KERNEL_SOURCES "Prevent the library from stripping source from kernels" OFF )
676+
option( BLAS_KEEP_KERNEL_SOURCES "Prevent the library from stripping source from kernels" ON )
677677
if( BLAS_KEEP_KERNEL_SOURCES )
678678
add_definitions( -DKEEP_CLBLAS_KERNEL_SOURCES )
679679
endif()
@@ -723,7 +723,7 @@ add_custom_command(TARGET OCLBinaryGenerator_GEN
723723
PRE_BUILD
724724
COMMAND ${CMAKE_COMMAND} -DOCLBinaryGeneratorBinaryDir=${OCLBinaryGeneratorBinaryDir} -DSOURCE_DIR=${CMAKE_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DOCL_COMPILER_FLAGS=${OCL_COMPILER_FLAGS}
725725
-P "${CMAKE_SOURCE_DIR}/library/OCLBinaryGenerator.cmake"
726-
)
726+
)
727727
add_dependencies( OCLBinaryGenerator_GEN OCLBinaryGenerator )
728728

729729
endif()
@@ -759,7 +759,7 @@ message(STATUS "OPENCL_VERSION = ${OPENCL_VERSION}")
759759
# list(GET OPENCL_FLAGS_REPLACED 1 OPENCL_FLAGS_REPLACED_1)#flags for TAHITI
760760
# list(GET OPENCL_FLAGS_REPLACED 3 OPENCL_FLAGS_REPLACED_3)#flags for HAWAII 1
761761
# list(GET OPENCL_FLAGS_REPLACED 5 OPENCL_FLAGS_REPLACED_5)#flags for HAWAII 2
762-
# list(GET OPENCL_FLAGS_REPLACED 7 OPENCL_FLAGS_REPLACED_7)#flags for BONAIRE
762+
# list(GET OPENCL_FLAGS_REPLACED 7 OPENCL_FLAGS_REPLACED_7)#flags for BONAIRE
763763
# else()
764764
# MESSAGE(STATUS "flags.txt not found. will use the default flags.")
765765
# set (LOAD_CL_FLAGS FALSE)
@@ -787,19 +787,19 @@ if (LOAD_CL_FLAGS)
787787
add_custom_target( GEN_CLBIN )
788788
add_custom_command(TARGET GEN_CLBIN
789789
PRE_BUILD
790-
COMMAND ${CMAKE_COMMAND} -DbingenBinaryDir=${bingenBinaryDir} -DCLTEMPLATE_PATH="${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates"
791-
-DLOAD_CL_FLAGS=${LOAD_CL_FLAGS} -DTAHITI_FLAG=${OPENCL_FLAGS_REPLACED_1} -DHAWAII1_FLAG=${OPENCL_FLAGS_REPLACED_3} -DHAWAII2_FLAG=${OPENCL_FLAGS_REPLACED_5} -DBONAIRE_FLAG=${OPENCL_FLAGS_REPLACED_7}
792-
-DENV_PATH=${ENV_PATH} -DOPENCL_OFFLINE_BUILD_HAWAII_KERNEL=${OPENCL_OFFLINE_BUILD_HAWAII_KERNEL} -DOPENCL_OFFLINE_BUILD_BONAIRE_KERNEL=${OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL}
790+
COMMAND ${CMAKE_COMMAND} -DbingenBinaryDir=${bingenBinaryDir} -DCLTEMPLATE_PATH="${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates"
791+
-DLOAD_CL_FLAGS=${LOAD_CL_FLAGS} -DTAHITI_FLAG=${OPENCL_FLAGS_REPLACED_1} -DHAWAII1_FLAG=${OPENCL_FLAGS_REPLACED_3} -DHAWAII2_FLAG=${OPENCL_FLAGS_REPLACED_5} -DBONAIRE_FLAG=${OPENCL_FLAGS_REPLACED_7}
792+
-DENV_PATH=${ENV_PATH} -DOPENCL_OFFLINE_BUILD_HAWAII_KERNEL=${OPENCL_OFFLINE_BUILD_HAWAII_KERNEL} -DOPENCL_OFFLINE_BUILD_BONAIRE_KERNEL=${OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL}
793793
-DOPENCL_OFFLINE_BUILD_TAHITI_KERNEL=${OPENCL_OFFLINE_BUILD_TAHITI_KERNEL}
794794
-P "${CMAKE_SOURCE_DIR}/library/bingen.cmake"
795-
)
795+
)
796796
add_dependencies( GEN_CLBIN bingen )
797797
else()
798798
add_custom_target( GEN_CLBIN )
799799
add_custom_command(TARGET GEN_CLBIN
800800
PRE_BUILD
801-
COMMAND ${CMAKE_COMMAND} -DbingenBinaryDir=${bingenBinaryDir} -DCLTEMPLATE_PATH="${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates"
802-
-DOPENCL_OFFLINE_BUILD_HAWAII_KERNEL=${OPENCL_OFFLINE_BUILD_HAWAII_KERNEL} -DOPENCL_OFFLINE_BUILD_BONAIRE_KERNEL=${OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL}
801+
COMMAND ${CMAKE_COMMAND} -DbingenBinaryDir=${bingenBinaryDir} -DCLTEMPLATE_PATH="${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates"
802+
-DOPENCL_OFFLINE_BUILD_HAWAII_KERNEL=${OPENCL_OFFLINE_BUILD_HAWAII_KERNEL} -DOPENCL_OFFLINE_BUILD_BONAIRE_KERNEL=${OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL}
803803
-DOPENCL_OFFLINE_BUILD_TAHITI_KERNEL=${OPENCL_OFFLINE_BUILD_TAHITI_KERNEL}
804804
-P "${CMAKE_SOURCE_DIR}/library/bingen.cmake"
805805
)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B0_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_NN_B0_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_NN_B0_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_NN_B0_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_NN_B0_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NN_B1_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_NN_B1_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_NN_B1_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_NN_B1_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_NN_B1_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B0_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_NT_B0_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_NT_B0_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_NT_B0_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_NT_B0_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_NT_B1_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_NT_B1_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_NT_B1_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_NT_B1_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_NT_B1_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B0_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_TN_B0_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_TN_B0_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_TN_B0_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_TN_B0_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/dgemm_Col_TN_B1_MX048_NX048_KX08_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_DGEMM_COL_TN_B1_MX048_NX048_KX08_SRC_H
66
#define KERNEL_DGEMM_COL_TN_B1_MX048_NX048_KX08_SRC_H
7-
#pragma message("AutoGemm's dgemm_Col_TN_B1_MX048_NX048_KX08_src overriden by user.")
7+
// #pragma message("AutoGemm's dgemm_Col_TN_B1_MX048_NX048_KX08_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/sgemm_Col_NN_B0_MX032_NX032_KX16_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_SGEMM_COL_NN_B0_MX032_NX032_KX16_SRC_H
66
#define KERNEL_SGEMM_COL_NN_B0_MX032_NX032_KX16_SRC_H
7-
#pragma message("AutoGemm's sgemm_Col_NN_B0_MX032_NX032_KX16_src overriden by user.")
7+
// #pragma message("AutoGemm's sgemm_Col_NN_B0_MX032_NX032_KX16_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/sgemm_Col_NN_B0_MX064_NX064_KX16_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_SGEMM_COL_NN_B0_MX064_NX064_KX16_SRC_H
66
#define KERNEL_SGEMM_COL_NN_B0_MX064_NX064_KX16_SRC_H
7-
#pragma message("AutoGemm's sgemm_Col_NN_B0_MX064_NX064_KX16_src overriden by user.")
7+
// #pragma message("AutoGemm's sgemm_Col_NN_B0_MX064_NX064_KX16_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

‎src/library/blas/AutoGemm/UserGemmKernelSources/sgemm_Col_NN_B0_MX096_NX096_KX16_src.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#ifndef KERNEL_SGEMM_COL_NN_B0_MX096_NX096_KX16_SRC_H
66
#define KERNEL_SGEMM_COL_NN_B0_MX096_NX096_KX16_SRC_H
7-
#pragma message("AutoGemm's sgemm_Col_NN_B0_MX096_NX096_KX16_src overriden by user.")
7+
// #pragma message("AutoGemm's sgemm_Col_NN_B0_MX096_NX096_KX16_src overriden by user.")
88

99
#ifndef STRINGIFY
1010
#define STRINGIFY(S) STRINGIFY2(S)

0 commit comments

Comments
 (0)