From 24eb9353d1e9b43e26b176255aae8864bca43112 Mon Sep 17 00:00:00 2001 From: Torre Zuk <42548444+TorreZuk@users.noreply.github.com> Date: Tue, 23 Jan 2024 14:25:52 -0700 Subject: [PATCH] better cmake LINK_BLIS option location (#777) * better option location * match install.sh BLIS OFF default for cuda --- clients/cmake/build-options.cmake | 7 ++++++- deps/CMakeLists.txt | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/clients/cmake/build-options.cmake b/clients/cmake/build-options.cmake index 94463037a..e568b3236 100644 --- a/clients/cmake/build-options.cmake +++ b/clients/cmake/build-options.cmake @@ -1,5 +1,5 @@ # ######################################################################## -# Copyright 2016-2020 Advanced Micro Devices, Inc. +# Copyright (C) 2016-2024 Advanced Micro Devices, Inc. # ######################################################################## # This file is intended to be used in two ways; independently in a stand alone PROJECT @@ -21,5 +21,10 @@ if( NOT BUILD_CLIENTS_SAMPLES ) option( BUILD_CLIENTS_SAMPLES "Build hipBLAS samples" OFF ) endif( ) +if( WIN32 OR HIP_PLATFORM STREQUAL nvidia ) + option( LINK_BLIS "Link AOCL Blis reference library" OFF ) +else() + option( LINK_BLIS "Link AOCL Blis reference library" ON ) +endif() diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 2acf6601a..2f5f48195 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -44,12 +44,6 @@ project( hipblas-dependencies NONE ) option( BUILD_GTEST "Download and build googletest library" ON ) option( BUILD_LAPACK "Download and build lapack library" ON ) -if( WIN32 ) - option( LINK_BLIS "Link AOCL Blis reference library" OFF ) -else() - option( LINK_BLIS "Link AOCL Blis reference library" ON ) -endif() - # option( BUILD_VERBOSE "Print helpful build debug information" OFF ) # if( BUILD_VERBOSE )