From 0b9aa4ebfa634b2431fe0e48943fff758939139e Mon Sep 17 00:00:00 2001 From: adibbley Date: Fri, 2 Jun 2023 14:07:26 -0400 Subject: [PATCH 01/13] Add nsight-compute recipe --- recipes/nsight-compute/bld.bat | 3 + recipes/nsight-compute/build.sh | 12 ++++ .../nsight-compute/conda_build_config.yaml | 2 + recipes/nsight-compute/meta.yaml | 60 +++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 recipes/nsight-compute/bld.bat create mode 100644 recipes/nsight-compute/build.sh create mode 100644 recipes/nsight-compute/conda_build_config.yaml create mode 100644 recipes/nsight-compute/meta.yaml diff --git a/recipes/nsight-compute/bld.bat b/recipes/nsight-compute/bld.bat new file mode 100644 index 0000000000000..471b2f4ce9964 --- /dev/null +++ b/recipes/nsight-compute/bld.bat @@ -0,0 +1,3 @@ +if not exist %PREFIX% mkdir %PREFIX% + +move nsight-compute %PREFIX% diff --git a/recipes/nsight-compute/build.sh b/recipes/nsight-compute/build.sh new file mode 100644 index 0000000000000..1ac3b965cf134 --- /dev/null +++ b/recipes/nsight-compute/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Install to conda style directories +[[ -d lib64 ]] && mv lib64 lib +mkdir -p ${PREFIX}/nsight-compute + +for i in `ls`; do + [[ $i == "build_env_setup.sh" ]] && continue + [[ $i == "conda_build.sh" ]] && continue + [[ $i == "metadata_conda_debug.yaml" ]] && continue + cp -r $i ${PREFIX}/nsight-compute +done diff --git a/recipes/nsight-compute/conda_build_config.yaml b/recipes/nsight-compute/conda_build_config.yaml new file mode 100644 index 0000000000000..52229a8424e52 --- /dev/null +++ b/recipes/nsight-compute/conda_build_config.yaml @@ -0,0 +1,2 @@ +arm_variant_type: # [aarch64] + - sbsa # [aarch64] diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml new file mode 100644 index 0000000000000..ea00bc4eb262c --- /dev/null +++ b/recipes/nsight-compute/meta.yaml @@ -0,0 +1,60 @@ +{% set name = "nsight-compute" %} +{% set version = "2022.4.0.15" %} +{% set cuda_version = "12.0" %} +{% set platform = "linux-x86_64" %} # [linux64] +{% set platform = "linux-ppc64le" %} # [ppc64le] +{% set platform = "linux-sbsa" %} # [aarch64] +{% set platform = "windows-x86_64" %} # [win] +{% set extension = "tar.xz" %} # [not win] +{% set extension = "zip" %} # [win] + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://developer.download.nvidia.com/compute/cuda/redist/nsight_compute/{{ platform }}/nsight_compute-{{ platform }}-{{ version }}-archive.{{ extension }} + sha256: f084e05eb4d2ba32aceb25e1dcfe03f2a50127630973722b65219cf9e986a139 # [linux64] + sha256: 20e58ce79681bc8fd39394cfb8f8316c177fe4175af3ae95c025996f45904732 # [ppc64le] + sha256: 7d0b3d4d01ce36657fa739496c7b0a9c627f5fa42021c1696ddd15e119bb05a4 # [aarch64] + sha256: 958da9986841c49cb5a2885d1e14e4c673ba94e4b404ef9389d083b7a0095d84 # [win] + +build: + number: 0 + skip: true # [osx] + missing_dso_whitelist: + - "*" + +requirements: + build: + - {{ compiler("c") }} + - {{ compiler("cxx") }} + - arm-variant * {{ arm_variant_type }} # [aarch64] + host: + - cuda-version {{ cuda_version }} + run: + - {{ pin_compatible("cuda-version", max_pin="x.x") }} + run_constrained: + - arm-variant * {{ arm_variant_type }} # [aarch64] + +test: + commands: + - test -f $PREFIX/bin/ncu # [linux] + - test -d $PREFIX/nsight-compute # [linux] + - if not exist %PREFIX%\nsight-compute exit 1 # [win] + +about: + home: https://developer.nvidia.com/nsight-compute + license_file: LICENSE + license: LicenseRef-NVIDIA-End-User-License-Agreement + license_url: https://docs.nvidia.com/cuda/eula/index.html + summary: NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications + description: | + NVIDIA Nsight Compute is an interactive kernel profiler for CUDA + applications on x86_64 platforms. It provides detailed performance + metrics and API debugging via a user interface and command line tool. + doc_url: https://docs.nvidia.com/nsight-compute/NsightCompute/index.html + +extra: + recipe-maintainers: + - adibbley From 95e1de16494c4334e7dbed459ea53bbe95137abc Mon Sep 17 00:00:00 2001 From: adibbley <103537006+adibbley@users.noreply.github.com> Date: Fri, 2 Jun 2023 15:58:16 -0400 Subject: [PATCH 02/13] Update recipes/nsight-compute/meta.yaml Co-authored-by: jakirkham --- recipes/nsight-compute/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index ea00bc4eb262c..7ebc248a2cbff 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -29,6 +29,7 @@ requirements: build: - {{ compiler("c") }} - {{ compiler("cxx") }} + - sysroot_{{ target_platform }} 2.17 - arm-variant * {{ arm_variant_type }} # [aarch64] host: - cuda-version {{ cuda_version }} From b8e17e469ef7acfe8c3714b799fd3bc43635791c Mon Sep 17 00:00:00 2001 From: adibbley Date: Mon, 5 Jun 2023 13:09:22 -0400 Subject: [PATCH 03/13] Remove x86_64 from description --- recipes/nsight-compute/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 7ebc248a2cbff..bd42dea5941cf 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -52,8 +52,8 @@ about: summary: NVIDIA Nsight Compute is an interactive kernel profiler for CUDA applications description: | NVIDIA Nsight Compute is an interactive kernel profiler for CUDA - applications on x86_64 platforms. It provides detailed performance - metrics and API debugging via a user interface and command line tool. + applications. It provides detailed performance metrics and API + debugging via a user interface and command line tool. doc_url: https://docs.nvidia.com/nsight-compute/NsightCompute/index.html extra: From 076125dc8e977b73f315f42da26c8a31822dd0bc Mon Sep 17 00:00:00 2001 From: adibbley Date: Wed, 14 Jun 2023 11:53:11 -0400 Subject: [PATCH 04/13] Fix expected layout --- recipes/nsight-compute/build.sh | 19 +++++++++++-------- recipes/nsight-compute/meta.yaml | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/recipes/nsight-compute/build.sh b/recipes/nsight-compute/build.sh index 1ac3b965cf134..4a517254788ec 100644 --- a/recipes/nsight-compute/build.sh +++ b/recipes/nsight-compute/build.sh @@ -2,11 +2,14 @@ # Install to conda style directories [[ -d lib64 ]] && mv lib64 lib -mkdir -p ${PREFIX}/nsight-compute - -for i in `ls`; do - [[ $i == "build_env_setup.sh" ]] && continue - [[ $i == "conda_build.sh" ]] && continue - [[ $i == "metadata_conda_debug.yaml" ]] && continue - cp -r $i ${PREFIX}/nsight-compute -done + +nsightVersion=$(echo $PKG_VERSION | cut -d. -f1-3) +nsightLib32="nsight-compute/${nsightVersion}/target/linux-desktop-glibc_2_11_3-x86/" + +# Remove 32bit libraries +[[ -d "${nsightLib32}" ]] && rm -rf ${nsightLib32} + +mkdir -p $PREFIX/bin +cp -rv bin/ncu $PREFIX/bin +cp -rv bin/ncu-ui $PREFIX/bin +cp -rv nsight-compute/$nsightVersion $PREFIX/nsight-compute-$nsightVersion diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index bd42dea5941cf..305c54c84f8c7 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -29,7 +29,7 @@ requirements: build: - {{ compiler("c") }} - {{ compiler("cxx") }} - - sysroot_{{ target_platform }} 2.17 + - sysroot_{{ target_platform }} 2.17 # [linux] - arm-variant * {{ arm_variant_type }} # [aarch64] host: - cuda-version {{ cuda_version }} @@ -41,8 +41,8 @@ requirements: test: commands: - test -f $PREFIX/bin/ncu # [linux] - - test -d $PREFIX/nsight-compute # [linux] - - if not exist %PREFIX%\nsight-compute exit 1 # [win] + - if not exist %PREFIX%\bin\ncu exit 1 # [win] + - ncu --version about: home: https://developer.nvidia.com/nsight-compute From 0291c940a0d7bcd5f749ea63855ea85dbf264e80 Mon Sep 17 00:00:00 2001 From: adibbley Date: Wed, 14 Jun 2023 12:55:55 -0400 Subject: [PATCH 05/13] No bin on Windows --- recipes/nsight-compute/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 305c54c84f8c7..7ecde3e1f8dc5 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -41,7 +41,7 @@ requirements: test: commands: - test -f $PREFIX/bin/ncu # [linux] - - if not exist %PREFIX%\bin\ncu exit 1 # [win] + - if not exist %PREFIX%\nsight-compute exit 1 # [win] - ncu --version about: From 240f7cdfa68d06ebc554ddbef5cde3805c65a0f0 Mon Sep 17 00:00:00 2001 From: adibbley Date: Wed, 14 Jun 2023 13:50:38 -0400 Subject: [PATCH 06/13] No ncu on Windows --- recipes/nsight-compute/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 7ecde3e1f8dc5..2cb64a924ca98 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -41,8 +41,8 @@ requirements: test: commands: - test -f $PREFIX/bin/ncu # [linux] + - ncu --version # [linux] - if not exist %PREFIX%\nsight-compute exit 1 # [win] - - ncu --version about: home: https://developer.nvidia.com/nsight-compute From 2621d7fd3c35b3cd31bf0358ce508791d4f14d4e Mon Sep 17 00:00:00 2001 From: adibbley Date: Wed, 14 Jun 2023 18:50:16 -0400 Subject: [PATCH 07/13] Remove Windows DLLs --- recipes/nsight-compute/bld.bat | 10 ++++++++-- recipes/nsight-compute/meta.yaml | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes/nsight-compute/bld.bat b/recipes/nsight-compute/bld.bat index 471b2f4ce9964..a5d9eaa4a7ca0 100644 --- a/recipes/nsight-compute/bld.bat +++ b/recipes/nsight-compute/bld.bat @@ -1,3 +1,9 @@ -if not exist %PREFIX% mkdir %PREFIX% +setlocal enableDelayedExpansion +for /F "tokens=1,2,3 delims=. " %%a in ("%PKG_VERSION%") do ( + set "version=%%a.%%b.%%c" +) +rmdir /q /s nsight-compute\!version!\lib -move nsight-compute %PREFIX% +move nsight-compute %LIBRARY_PREFIX% + +mklink /h %LIBRARY_BIN%\ncu %LIBRARY_PREFIX%\nsight-compute\!version!\ncu.bat diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 2cb64a924ca98..1ce30e5086b59 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -1,5 +1,6 @@ {% set name = "nsight-compute" %} {% set version = "2022.4.0.15" %} +{% set version_split = version.split(".")[0]+"."+version.split(".")[1]+"."+version.split(".")[2] %} {% set cuda_version = "12.0" %} {% set platform = "linux-x86_64" %} # [linux64] {% set platform = "linux-ppc64le" %} # [ppc64le] @@ -41,8 +42,10 @@ requirements: test: commands: - test -f $PREFIX/bin/ncu # [linux] - - ncu --version # [linux] - - if not exist %PREFIX%\nsight-compute exit 1 # [win] + - if not exist %LIBRARY_PREFIX%\nsight-compute exit 1 # [win] + - if exist %LIBRARY_PREFIX%\nsight-compute\{{ version_split }}\lib exit 1 # [win] + - if not exist %LIBRARY_BIN%\ncu exit 1 # [win] + - ncu --version about: home: https://developer.nvidia.com/nsight-compute From 16d25d1e13bc4d80e1fda469c799b416f655cf66 Mon Sep 17 00:00:00 2001 From: adibbley <103537006+adibbley@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:05:19 -0400 Subject: [PATCH 08/13] Apply suggestions from code review Co-authored-by: jakirkham --- recipes/nsight-compute/bld.bat | 12 +++++++++++- recipes/nsight-compute/meta.yaml | 2 -- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/recipes/nsight-compute/bld.bat b/recipes/nsight-compute/bld.bat index a5d9eaa4a7ca0..ac57b69562ded 100644 --- a/recipes/nsight-compute/bld.bat +++ b/recipes/nsight-compute/bld.bat @@ -1,3 +1,7 @@ +if not exist %PREFIX% mkdir %PREFIX% +if not exist %LIBRARY_PREFIX% mkdir %LIBRARY_PREFIX% +if not exist %SCRIPTS% mkdir %SCRIPTS% + setlocal enableDelayedExpansion for /F "tokens=1,2,3 delims=. " %%a in ("%PKG_VERSION%") do ( set "version=%%a.%%b.%%c" @@ -6,4 +10,10 @@ rmdir /q /s nsight-compute\!version!\lib move nsight-compute %LIBRARY_PREFIX% -mklink /h %LIBRARY_BIN%\ncu %LIBRARY_PREFIX%\nsight-compute\!version!\ncu.bat +:: Create bat links for all exe files in %LIBRARY_PREFIX%\nsight-compute +cd %SCRIPTS% +for /r "%LIBRARY_PREFIX%\nsight-compute" %%f in (*.exe) do ( + echo @echo off > %%~nf.bat + echo %%~dp0.\nsight-compute\%%~nf.exe %%* >> %%~nf.bat + if errorlevel 1 exit 1 +) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 1ce30e5086b59..1fff41dfb6767 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -23,8 +23,6 @@ source: build: number: 0 skip: true # [osx] - missing_dso_whitelist: - - "*" requirements: build: From 0cffcc8312ce1a2e3dc91dd0f770383a21aca162 Mon Sep 17 00:00:00 2001 From: adibbley <103537006+adibbley@users.noreply.github.com> Date: Fri, 23 Jun 2023 09:09:41 -0400 Subject: [PATCH 09/13] Apply suggestions from code review Co-authored-by: jakirkham --- recipes/nsight-compute/bld.bat | 2 +- recipes/nsight-compute/meta.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/nsight-compute/bld.bat b/recipes/nsight-compute/bld.bat index ac57b69562ded..fc61347960d3c 100644 --- a/recipes/nsight-compute/bld.bat +++ b/recipes/nsight-compute/bld.bat @@ -14,6 +14,6 @@ move nsight-compute %LIBRARY_PREFIX% cd %SCRIPTS% for /r "%LIBRARY_PREFIX%\nsight-compute" %%f in (*.exe) do ( echo @echo off > %%~nf.bat - echo %%~dp0.\nsight-compute\%%~nf.exe %%* >> %%~nf.bat + echo %%~dp0..\Library\nsight-compute\%%~nf.exe %%* >> %%~nf.bat if errorlevel 1 exit 1 ) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index 1fff41dfb6767..fe5624cea8f68 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -32,8 +32,12 @@ requirements: - arm-variant * {{ arm_variant_type }} # [aarch64] host: - cuda-version {{ cuda_version }} + - boost-cpp + - icu + - qt-main run: - {{ pin_compatible("cuda-version", max_pin="x.x") }} + - {{ pin_compatible("boost-cpp", max_pin="x.x") }} run_constrained: - arm-variant * {{ arm_variant_type }} # [aarch64] From 17adc8b19a6984059b91404021c2ea5e4eb45c0d Mon Sep 17 00:00:00 2001 From: adibbley Date: Fri, 23 Jun 2023 11:00:15 -0400 Subject: [PATCH 10/13] Fix tests --- recipes/nsight-compute/bld.bat | 2 +- recipes/nsight-compute/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/nsight-compute/bld.bat b/recipes/nsight-compute/bld.bat index fc61347960d3c..222691227ca34 100644 --- a/recipes/nsight-compute/bld.bat +++ b/recipes/nsight-compute/bld.bat @@ -14,6 +14,6 @@ move nsight-compute %LIBRARY_PREFIX% cd %SCRIPTS% for /r "%LIBRARY_PREFIX%\nsight-compute" %%f in (*.exe) do ( echo @echo off > %%~nf.bat - echo %%~dp0..\Library\nsight-compute\%%~nf.exe %%* >> %%~nf.bat + echo %%~dp0..\Library\nsight-compute\!version!\%%~nf.bat %%* >> %%~nf.bat if errorlevel 1 exit 1 ) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index fe5624cea8f68..c6b2acfb6c8e5 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -46,7 +46,7 @@ test: - test -f $PREFIX/bin/ncu # [linux] - if not exist %LIBRARY_PREFIX%\nsight-compute exit 1 # [win] - if exist %LIBRARY_PREFIX%\nsight-compute\{{ version_split }}\lib exit 1 # [win] - - if not exist %LIBRARY_BIN%\ncu exit 1 # [win] + - if not exist %PREFIX%\Scripts\ncu.bat exit 1 # [win] - ncu --version about: From 8b1a3a78156c01b032299eafae5ea6e5c519a6e2 Mon Sep 17 00:00:00 2001 From: adibbley Date: Mon, 26 Jun 2023 11:40:37 -0400 Subject: [PATCH 11/13] Expand whitelist --- recipes/nsight-compute/meta.yaml | 150 +++++++++++++++++++++++++++++-- 1 file changed, 144 insertions(+), 6 deletions(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index c6b2acfb6c8e5..fee8a875ca2ce 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -23,6 +23,103 @@ source: build: number: 0 skip: true # [osx] + missing_dso_whitelist: + - '$RPATH/libpapi.so.5' + - '$RPATH/libpfm.so.4' + - '$RPATH/libGLX.so.0' + - '$RPATH/libOpenGL.so.0' + - '$RPATH/libprotobuf-shared.so' + - '$RPATH/libnvlog.so' + - '$RPATH/libCommonProtoServices.so' + - '$RPATH/libXfixes.so.3' + - '$RPATH/libTimelineCommon.so' + - '$RPATH/ld64.so.2' + - '$RPATH/libssh.so' + - '$RPATH/libcrypto.so.1.1' + - '$RPATH/libAgentAPI.so' + - '$RPATH/libAnalysisData.so' + - '$RPATH/libAnalysisProto.so' + - '$RPATH/libAnalysis.so' + - '$RPATH/libAppLibInterfaces.so' + - '$RPATH/libAppLib.so' + - '$RPATH/libAssert.so' + - '$RPATH/libcom_err.so.2' + - '$RPATH/libCommonNsysServer.so' + - '$RPATH/libCommonProtoStreamSections.so' + - '$RPATH/libCore.so' + - '$RPATH/libCudaDrvApiWrapper.so' + - '$RPATH/libcuda.so.1' + - '$RPATH/libDevicePropertyProto.so' + - '$RPATH/libDeviceProperty.so' + - '$RPATH/libexporter.so' + - '$RPATH/libGenericHierarchy.so' + - '$RPATH/libGpuInfo.so' + - '$RPATH/libHostCommon.so' + - '$RPATH/libibmad.so.5' + - '$RPATH/libInterceptorInjectionTarget.so' + - '$RPATH/libInterfaceData.so' + - '$RPATH/libInterfaceSharedBase.so' + - '$RPATH/libInterfaceSharedCore.so' + - '$RPATH/libInterfaceSharedLoggers.so' + - '$RPATH/libInterfaceShared.so' + - '$RPATH/libLinuxPerf.so' + - '$RPATH/libNsysServerProto.so' + - '$RPATH/libNvtxExtData.so' + - '$RPATH/libProcessLauncher.so' + - '$RPATH/libStreamSections.so' + - '$RPATH/libSymbolAnalyzerLight.so' + - '$RPATH/libSymbolDemangler.so' + - '$RPATH/libTimelineAssert.so' + - '$RPATH/libTimelineUIUtils.so' + - '$RPATH/libTimelineWidget.so' + - '$RPATH/libucm.so.0' + - '$RPATH/libucp.so.0' + - '$RPATH/libucs.so.0' + - '$RPATH/libuct.so.0' + - '$RPATH/libicuuc.so.71' + - '$RPATH/libicudata.so.71' + - '$RPATH/libcurl.so.4' +#not sure + - '$RPATH/libEGL.so.1' + - '$RPATH/libGL.so.1' + - '$RPATH/libjpeg.so.62' + - '$RPATH/libProtobufCommClient.so' + - '$RPATH/libProtobufCommProto.so' + - '$RPATH/libProtobufComm.so' + - '$RPATH/libtiff.so.5' + - '$RPATH/libSshClient.so' #not libssh +#cdt-builds? + - '$RPATH/libibumad.so.3' + - '$RPATH/libibverbs.so.1' + - '$RPATH/libxshmfence.so.1' +#qt-feedstock only has libQt5 + - '$RPATH/libQt6WaylandClient.so.6' + - '$RPATH/libQt6Core.so.6' + - '$RPATH/libQt6Gui.so.6' + - '$RPATH/libQt6Widgets.so.6' + - '$RPATH/libNvQtGui.so' + - '$RPATH/libQt6Charts.so.6' + - '$RPATH/libQt6Concurrent.so.6' + - '$RPATH/libQt6DBus.so.6' + - '$RPATH/libQt6Network.so.6' + - '$RPATH/libQt6OpenGL.so.6' + - '$RPATH/libQt6OpenGLWidgets.so.6' + - '$RPATH/libQt6Positioning.so.6' + - '$RPATH/libQt6PrintSupport.so.6' + - '$RPATH/libQt6QmlModels.so.6' + - '$RPATH/libQt6Qml.so.6' + - '$RPATH/libQt6Quick.so.6' + - '$RPATH/libQt6StateMachine.so.6' + - '$RPATH/libQt6Svg.so.6' + - '$RPATH/libQt6UiTools.so.6' + - '$RPATH/libQt6WaylandEglClientHwIntegration.so.6' + - '$RPATH/libQt6WebChannel.so.6' + - '$RPATH/libQt6WebEngineCore.so.6' + - '$RPATH/libQt6WebEngineWidgets.so.6' + - '$RPATH/libQt6WlShellIntegration.so.6' + - '$RPATH/libQt6XcbQpa.so.6' + - '$RPATH/libQt6Xml.so.6' + - '$RPATH/libQtPropertyBrowser.so' requirements: build: @@ -31,13 +128,54 @@ requirements: - sysroot_{{ target_platform }} 2.17 # [linux] - arm-variant * {{ arm_variant_type }} # [aarch64] host: - - cuda-version {{ cuda_version }} - - boost-cpp - - icu - - qt-main + - cuda-version {{ cuda_version }} + - boost-cpp + #- icu #not helping? + - dbus + - wayland # [linux] + - libxkbcommon + - libexpat + - freetype + - fontconfig + - alsa-lib + - libglib + - libxcb + - libzlib + - nspr + - nss + - xorg-libxrender + - xcb-util-image + - xcb-util-renderutil + - xcb-util-keysyms + - xcb-util-wm + - xorg-libx11 + - xorg-libsm + - xorg-libice + - xorg-libxext + - xorg-libxrender + - xcb-util-wm + - xcb-util-keysyms + - krb5 + - libxkbfile + - xorg-libxrandr + - xorg-libxtst + - xorg-libxcomposite + - xorg-libxdamage + - xorg-libxfixes +#requires krb5 + #- qt-main + #- libcurl run: - - {{ pin_compatible("cuda-version", max_pin="x.x") }} - - {{ pin_compatible("boost-cpp", max_pin="x.x") }} + - {{ pin_compatible("cuda-version", max_pin="x.x") }} + - {{ pin_compatible("boost-cpp", max_pin="x.x") }} + - {{ pin_compatible("libexpat", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxrender", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxrandr", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxtst", max_pin="x.x") }} + - {{ pin_compatible("libxkbfile", max_pin="x.x") }} run_constrained: - arm-variant * {{ arm_variant_type }} # [aarch64] From 279ad061ea93f24620893acd941b66df851941fc Mon Sep 17 00:00:00 2001 From: adibbley Date: Mon, 10 Jul 2023 09:09:11 -0400 Subject: [PATCH 12/13] Clean up linux requirements --- recipes/nsight-compute/meta.yaml | 52 ++++++++++++++------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index fee8a875ca2ce..af747d2bf4ab3 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -129,47 +129,39 @@ requirements: - arm-variant * {{ arm_variant_type }} # [aarch64] host: - cuda-version {{ cuda_version }} + - alsa-lib - boost-cpp - #- icu #not helping? - dbus - - wayland # [linux] - - libxkbcommon - - libexpat - - freetype + - expat - fontconfig - - alsa-lib + - freetype + - krb5 - libglib - libxcb + - libxkbcommon + - libxkbfile - libzlib - nspr - nss - - xorg-libxrender - - xcb-util-image - - xcb-util-renderutil - - xcb-util-keysyms - - xcb-util-wm - - xorg-libx11 - - xorg-libsm - - xorg-libice - - xorg-libxext - - xorg-libxrender - - xcb-util-wm - - xcb-util-keysyms - - krb5 - - libxkbfile - - xorg-libxrandr - - xorg-libxtst - - xorg-libxcomposite - - xorg-libxdamage - - xorg-libxfixes -#requires krb5 - #- qt-main - #- libcurl + - wayland # [linux] + - xcb-util-image # [linux] + - xcb-util-keysyms # [linux] + - xcb-util-keysyms # [linux] + - xcb-util-renderutil # [linux] + - xcb-util-wm # [linux] + - xorg-libice # [linux] + - xorg-libsm # [linux] + - xorg-libx11 # [linux] + - xorg-libxcomposite # [linux] + - xorg-libxdamage # [linux] + - xorg-libxext # [linux] + - xorg-libxfixes # [linux] + - xorg-libxrandr # [linux] + - xorg-libxrender # [linux] + - xorg-libxtst # [linux] run: - {{ pin_compatible("cuda-version", max_pin="x.x") }} - {{ pin_compatible("boost-cpp", max_pin="x.x") }} - - {{ pin_compatible("libexpat", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxrender", max_pin="x.x") }} - {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }} - {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }} - {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }} From 9d29863ff46cf64c535e34e68183e5e695b028d3 Mon Sep 17 00:00:00 2001 From: adibbley Date: Mon, 10 Jul 2023 09:56:07 -0400 Subject: [PATCH 13/13] Clean up Windows requirements --- recipes/nsight-compute/meta.yaml | 123 ++++--------------------------- 1 file changed, 13 insertions(+), 110 deletions(-) diff --git a/recipes/nsight-compute/meta.yaml b/recipes/nsight-compute/meta.yaml index af747d2bf4ab3..dfd21d2131f82 100644 --- a/recipes/nsight-compute/meta.yaml +++ b/recipes/nsight-compute/meta.yaml @@ -24,102 +24,7 @@ build: number: 0 skip: true # [osx] missing_dso_whitelist: - - '$RPATH/libpapi.so.5' - - '$RPATH/libpfm.so.4' - - '$RPATH/libGLX.so.0' - - '$RPATH/libOpenGL.so.0' - - '$RPATH/libprotobuf-shared.so' - - '$RPATH/libnvlog.so' - - '$RPATH/libCommonProtoServices.so' - - '$RPATH/libXfixes.so.3' - - '$RPATH/libTimelineCommon.so' - - '$RPATH/ld64.so.2' - - '$RPATH/libssh.so' - - '$RPATH/libcrypto.so.1.1' - - '$RPATH/libAgentAPI.so' - - '$RPATH/libAnalysisData.so' - - '$RPATH/libAnalysisProto.so' - - '$RPATH/libAnalysis.so' - - '$RPATH/libAppLibInterfaces.so' - - '$RPATH/libAppLib.so' - - '$RPATH/libAssert.so' - - '$RPATH/libcom_err.so.2' - - '$RPATH/libCommonNsysServer.so' - - '$RPATH/libCommonProtoStreamSections.so' - - '$RPATH/libCore.so' - - '$RPATH/libCudaDrvApiWrapper.so' - - '$RPATH/libcuda.so.1' - - '$RPATH/libDevicePropertyProto.so' - - '$RPATH/libDeviceProperty.so' - - '$RPATH/libexporter.so' - - '$RPATH/libGenericHierarchy.so' - - '$RPATH/libGpuInfo.so' - - '$RPATH/libHostCommon.so' - - '$RPATH/libibmad.so.5' - - '$RPATH/libInterceptorInjectionTarget.so' - - '$RPATH/libInterfaceData.so' - - '$RPATH/libInterfaceSharedBase.so' - - '$RPATH/libInterfaceSharedCore.so' - - '$RPATH/libInterfaceSharedLoggers.so' - - '$RPATH/libInterfaceShared.so' - - '$RPATH/libLinuxPerf.so' - - '$RPATH/libNsysServerProto.so' - - '$RPATH/libNvtxExtData.so' - - '$RPATH/libProcessLauncher.so' - - '$RPATH/libStreamSections.so' - - '$RPATH/libSymbolAnalyzerLight.so' - - '$RPATH/libSymbolDemangler.so' - - '$RPATH/libTimelineAssert.so' - - '$RPATH/libTimelineUIUtils.so' - - '$RPATH/libTimelineWidget.so' - - '$RPATH/libucm.so.0' - - '$RPATH/libucp.so.0' - - '$RPATH/libucs.so.0' - - '$RPATH/libuct.so.0' - - '$RPATH/libicuuc.so.71' - - '$RPATH/libicudata.so.71' - - '$RPATH/libcurl.so.4' -#not sure - - '$RPATH/libEGL.so.1' - - '$RPATH/libGL.so.1' - - '$RPATH/libjpeg.so.62' - - '$RPATH/libProtobufCommClient.so' - - '$RPATH/libProtobufCommProto.so' - - '$RPATH/libProtobufComm.so' - - '$RPATH/libtiff.so.5' - - '$RPATH/libSshClient.so' #not libssh -#cdt-builds? - - '$RPATH/libibumad.so.3' - - '$RPATH/libibverbs.so.1' - - '$RPATH/libxshmfence.so.1' -#qt-feedstock only has libQt5 - - '$RPATH/libQt6WaylandClient.so.6' - - '$RPATH/libQt6Core.so.6' - - '$RPATH/libQt6Gui.so.6' - - '$RPATH/libQt6Widgets.so.6' - - '$RPATH/libNvQtGui.so' - - '$RPATH/libQt6Charts.so.6' - - '$RPATH/libQt6Concurrent.so.6' - - '$RPATH/libQt6DBus.so.6' - - '$RPATH/libQt6Network.so.6' - - '$RPATH/libQt6OpenGL.so.6' - - '$RPATH/libQt6OpenGLWidgets.so.6' - - '$RPATH/libQt6Positioning.so.6' - - '$RPATH/libQt6PrintSupport.so.6' - - '$RPATH/libQt6QmlModels.so.6' - - '$RPATH/libQt6Qml.so.6' - - '$RPATH/libQt6Quick.so.6' - - '$RPATH/libQt6StateMachine.so.6' - - '$RPATH/libQt6Svg.so.6' - - '$RPATH/libQt6UiTools.so.6' - - '$RPATH/libQt6WaylandEglClientHwIntegration.so.6' - - '$RPATH/libQt6WebChannel.so.6' - - '$RPATH/libQt6WebEngineCore.so.6' - - '$RPATH/libQt6WebEngineWidgets.so.6' - - '$RPATH/libQt6WlShellIntegration.so.6' - - '$RPATH/libQt6XcbQpa.so.6' - - '$RPATH/libQt6Xml.so.6' - - '$RPATH/libQtPropertyBrowser.so' + - '*' requirements: build: @@ -129,20 +34,19 @@ requirements: - arm-variant * {{ arm_variant_type }} # [aarch64] host: - cuda-version {{ cuda_version }} - - alsa-lib - - boost-cpp - - dbus + - alsa-lib # [linux] + - dbus # [linux] - expat - fontconfig - freetype - krb5 - libglib - libxcb - - libxkbcommon - - libxkbfile + - libxkbcommon # [linux] + - libxkbfile # [linux] - libzlib - - nspr - - nss + - nspr # [linux] + - nss # [linux] - wayland # [linux] - xcb-util-image # [linux] - xcb-util-keysyms # [linux] @@ -161,13 +65,12 @@ requirements: - xorg-libxtst # [linux] run: - {{ pin_compatible("cuda-version", max_pin="x.x") }} - - {{ pin_compatible("boost-cpp", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxrandr", max_pin="x.x") }} - - {{ pin_compatible("xorg-libxtst", max_pin="x.x") }} - - {{ pin_compatible("libxkbfile", max_pin="x.x") }} + - {{ pin_compatible("xorg-libxcomposite", max_pin="x.x") }} # [linux] + - {{ pin_compatible("xorg-libxdamage", max_pin="x.x") }} # [linux] + - {{ pin_compatible("xorg-libxfixes", max_pin="x.x") }} # [linux] + - {{ pin_compatible("xorg-libxrandr", max_pin="x.x") }} # [linux] + - {{ pin_compatible("xorg-libxtst", max_pin="x.x") }} # [linux] + - {{ pin_compatible("libxkbfile", max_pin="x.x") }} # [linux] run_constrained: - arm-variant * {{ arm_variant_type }} # [aarch64]