From d8756e740f758cd867c6dd13e5fa3306a640c1a8 Mon Sep 17 00:00:00 2001
From: Umar Arshad <umar@arrayfire.com>
Date: Wed, 11 May 2022 22:07:22 -0400
Subject: [PATCH] Add /usr/ to find_library for cudnn for ArchLinux

---
 ports/cudnn/FindCUDNN.cmake | 2 +-
 ports/cudnn/portfile.cmake  | 4 ++--
 ports/cudnn/vcpkg.json      | 2 +-
 versions/baseline.json      | 2 +-
 versions/c-/cudnn.json      | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake
index 4e013bca705da4..c90f3a79189d95 100644
--- a/ports/cudnn/FindCUDNN.cmake
+++ b/ports/cudnn/FindCUDNN.cmake
@@ -28,7 +28,7 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
   HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include
   PATH_SUFFIXES cuda/include include)
 find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
-  HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/
+  HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/
   PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64)
 if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
   file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS)
diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake
index 5fd95634c40a3e..594c74fed6e6cb 100644
--- a/ports/cudnn/portfile.cmake
+++ b/ports/cudnn/portfile.cmake
@@ -19,7 +19,7 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
   PATH_SUFFIXES cuda/include include)
 message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}")
 find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
-  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/
+  HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/
   PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64)
 message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}")
 if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
@@ -73,4 +73,4 @@ endif()
 
 file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file
+file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json
index 50b47fe7a01878..ffb97ee1723f8d 100644
--- a/ports/cudnn/vcpkg.json
+++ b/ports/cudnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cudnn",
   "version": "7.6.5",
-  "port-version": 5,
+  "port-version": 6,
   "description": "NVIDIA's cuDNN deep neural network acceleration library.",
   "homepage": "https://developer.nvidia.com/cudnn",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index a106b41d4f524c..82674e1621d6a1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1734,7 +1734,7 @@
     },
     "cudnn": {
       "baseline": "7.6.5",
-      "port-version": 5
+      "port-version": 6
     },
     "cunit": {
       "baseline": "2.1.3",
diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json
index 9fa8f53a35d661..7c7b0ef9a93491 100644
--- a/versions/c-/cudnn.json
+++ b/versions/c-/cudnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653",
+      "version": "7.6.5",
+      "port-version": 6
+    },
     {
       "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e",
       "version": "7.6.5",