Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Renaming binaries / libraries #381

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6fa2a2f
Rename the omnitrace-dl library - Part 1
dgaliffiAMD Sep 11, 2024
0d00267
Rename the omnitrace-rt library
dgaliffiAMD Sep 11, 2024
4348317
Rename the omnitrace-user library
dgaliffiAMD Sep 12, 2024
ae15a05
Rename the omnitrace-rt library - Part 2
dgaliffiAMD Sep 12, 2024
a664a07
Rename omnitrace-dl library - Part 2
dgaliffiAMD Sep 12, 2024
a6b5e1a
Rename the omnitrace-core library
dgaliffiAMD Sep 12, 2024
86c21ab
Rename the omnitrace-binary library
dgaliffiAMD Sep 12, 2024
117e28f
Source formatting
dgaliffiAMD Sep 12, 2024
0c0ed86
Rename the omnitrace library
dgaliffiAMD Sep 13, 2024
7feae63
Format source
dgaliffiAMD Sep 13, 2024
2040dd7
Rename the omnitrace-avail binary
dgaliffiAMD Sep 13, 2024
3fcd2b3
Format CMake files
dgaliffiAMD Sep 13, 2024
4048596
Remove omnitrace-exe
dgaliffiAMD Sep 14, 2024
4a47eec
Rename the omnitrace-sample binary
dgaliffiAMD Sep 14, 2024
20b3905
Rename the omntrace-causal binary
dgaliffiAMD Sep 14, 2024
c6252b9
Rename omnitrace-capchk binary
dgaliffiAMD Sep 14, 2024
0622844
Rename omnitrace-instrument binary
dgaliffiAMD Sep 14, 2024
2f52e2f
Update test-install test names
dgaliffiAMD Sep 14, 2024
4050dfd
Update tests
dgaliffiAMD Sep 14, 2024
13d1a3a
Rename omnitrace-run binary
dgaliffiAMD Sep 14, 2024
49aa587
Rename omnitrace-python binary, python module, and tests
dgaliffiAMD Sep 23, 2024
2b2c788
Fixed some python tests
dgaliffiAMD Sep 24, 2024
a3b57b6
Update CMake project name to `rocprofsys`.
dgaliffiAMD Sep 26, 2024
4569c93
Revert change to "rocprofsys-instrument-simulate-lib" test until logg…
dgaliffiAMD Sep 26, 2024
9ba7d82
cmake formatting
dgaliffiAMD Sep 26, 2024
e37c956
source formatting
dgaliffiAMD Sep 26, 2024
2087f08
python formatting
dgaliffiAMD Sep 26, 2024
0537a4a
Fix the name of librocprof-sys.so in module file
dgaliffiAMD Sep 27, 2024
95a3613
Set install folder to `rocprof-sys` rather than `rocprofsys`.
dgaliffiAMD Sep 27, 2024
217ecf4
Fix cmake formatting.
dgaliffiAMD Sep 27, 2024
6f3a171
Update Copyright header to 2024.
dgaliffiAMD Sep 27, 2024
50e8375
Remove debug logging.
dgaliffiAMD Sep 27, 2024
116f3f6
Update packaging name to use $PACKAGE_NAME
dgaliffiAMD Sep 27, 2024
4dc811e
Fix install path for the LICENSE file.
dgaliffiAMD Sep 27, 2024
10ad119
Fix RPATH to use $PACKAGE_NAME
dgaliffiAMD Sep 27, 2024
da0c484
Fix include-dir for dl library
dgaliffiAMD Sep 27, 2024
dc34d42
Fix name in log
dgaliffiAMD Sep 27, 2024
bac5128
Update default name for the config file
dgaliffiAMD Oct 1, 2024
6d8640f
Update project name passed to timemory_init
dgaliffiAMD Oct 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/opensuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,20 @@ jobs:
run: |
set -v
export OMNITRACE_DEBUG=ON
which omnitrace-avail
ldd $(which omnitrace-avail)
omnitrace-avail --help
omnitrace-avail -a
which omnitrace
ldd $(which omnitrace)
omnitrace-instrument --help
omnitrace-instrument -e -v 1 -o ls.inst --simulate -- ls
which rocprof-sys-avail
ldd $(which rocprof-sys-avail)
rocprof-sys-avail --help
rocprof-sys-avail -a
which rocprof-sys-instrument
ldd $(which rocprof-sys-instrument)
rocprof-sys-instrument --help
rocprof-sys-instrument -e -v 1 -o ls.inst --simulate -- ls
for i in $(find omnitrace-ls.inst-output -type f); do echo -e "\n\n --> ${i} \n\n"; cat ${i}; done
omnitrace-instrument -e -v 1 -o ls.inst -- ls
omnitrace-run -- ./ls.inst
omnitrace-instrument -e -v 1 --simulate -- ls
rocprof-sys-instrument -e -v 1 -o ls.inst -- ls
rocprof-sys-run -- ./ls.inst
rocprof-sys-instrument -e -v 1 --simulate -- ls
for i in $(find omnitrace-ls-output -type f); do echo -e "\n\n --> ${i} \n\n"; cat ${i}; done
omnitrace-instrument -e -v 1 -- ls
rocprof-sys-instrument -e -v 1 -- ls

- name: Test User API
timeout-minutes: 10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ jobs:
shell: bash
run: |
set -v
source /opt/omnitrace/share/omnitrace/setup-env.sh
./scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,rewrite,runtime,python}=1
source /opt/omnitrace/share/rocprofsys/setup-env.sh
./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,rewrite,runtime,python}=1

- name: Test User API
timeout-minutes: 10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y cmake
cmake -D OUTPUT_DIR=${PWD} -P scripts/write-omnitrace-install.cmake
cmake -D OUTPUT_DIR=${PWD} -P scripts/write-rocprofsys-install.cmake
- name: Generate Release
uses: softprops/action-gh-release@v1
with:
draft: False
generate_release_notes: True
fail_on_unmatched_files: True
files: |
omnitrace-install.py
rocprof-sys-install.py
46 changes: 23 additions & 23 deletions .github/workflows/ubuntu-focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,24 +167,24 @@ jobs:
source /usr/share/modules/init/$(basename ${SHELL})
module use ./share/modulefiles
module avail
module load omnitrace
echo $(which omnitrace)
ldd $(which omnitrace)
omnitrace-instrument --help
omnitrace-avail --help
omnitrace-sample --help
module load rocprofsys
echo $(which rocprof-sys-instrument)
ldd $(which rocprof-sys-instrument)
rocprof-sys-instrument --help
rocprof-sys-avail --help
rocprof-sys-sample --help

- name: Test Build-Tree Source Script
timeout-minutes: 45
shell: bash
run: |
cd build
source ./share/omnitrace/setup-env.sh
echo $(which omnitrace)
ldd $(which omnitrace)
omnitrace-instrument --help
omnitrace-avail --help
omnitrace-sample --help
source ./share/rocprofsys/setup-env.sh
echo $(which rocprof-sys-instrument)
ldd $(which rocprof-sys-instrument)
rocprof-sys-instrument --help
rocprof-sys-avail --help
rocprof-sys-sample --help

- name: Install
timeout-minutes: 10
Expand All @@ -198,8 +198,8 @@ jobs:
source /usr/share/modules/init/$(basename ${SHELL})
module use /opt/omnitrace/share/modulefiles
module avail
module load omnitrace
./scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,rewrite,runtime}=1 --test-omnitrace-python=${{ matrix.python }}
module load rocprofsys
./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,rewrite,runtime}=1 --test-rocprof-sys-python=${{ matrix.python }}

- name: Test User API
timeout-minutes: 10
Expand Down Expand Up @@ -358,8 +358,8 @@ jobs:
timeout-minutes: 15
shell: bash
run: |
source /opt/omnitrace/share/omnitrace/setup-env.sh
./scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,python,rewrite,runtime}=1
source /opt/omnitrace/share/rocprofsys/setup-env.sh
./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1

- name: Test User API
timeout-minutes: 10
Expand Down Expand Up @@ -502,13 +502,13 @@ jobs:
source /usr/share/modules/init/$(basename ${SHELL})
module use ${{ github.workspace }}/build/share/modulefiles
module avail
module load omnitrace
module load rocprofsys
module list
env
module unload omnitrace
module unload rocprofsys
module list
env
source ${{ github.workspace }}/build/share/omnitrace/setup-env.sh
source ${{ github.workspace }}/build/share/rocprofsys/setup-env.sh
env

- name: Install
Expand All @@ -522,17 +522,17 @@ jobs:
timeout-minutes: 15
run: |
set -v
source /opt/omnitrace/share/omnitrace/setup-env.sh
${{ github.workspace }}/scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,python,rewrite,runtime}=1
source /opt/omnitrace/share/rocprofsys/setup-env.sh
${{ github.workspace }}/scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1

- name: Test Install with Modulefile
timeout-minutes: 15
run: |
set -v
source /usr/share/modules/init/$(basename ${SHELL})
module use /opt/omnitrace/share/modulefiles
module load omnitrace
${{ github.workspace }}/scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,python,rewrite,runtime}=1
module load rocprofsys
${{ github.workspace }}/scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1

- name: Test User API
timeout-minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
module use /opt/omnitrace/share/modulefiles
module avail
module load omnitrace
./scripts/test-install.sh --test-omnitrace-{instrument,avail,sample,python,rewrite,runtime}=1
./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1

- name: Test User API
timeout-minutes: 10
Expand Down
34 changes: 21 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif()
if(NOT UNIX OR APPLE)
message(
AUTHOR_WARNING
"omnitrace only supports Linux. Configure and/or build is likely to fail")
"rocprof-sys only supports Linux. Configure and/or build is likely to fail")
endif()

file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FULL_VERSION_STRING LIMIT_COUNT 1)
Expand All @@ -21,11 +21,14 @@ string(REGEX REPLACE "([0-9]+)\.([0-9]+)\.([0-9]+)(.*)" "\\1.\\2.\\3" OMNITRACE_
"${FULL_VERSION_STRING}")

project(
omnitrace
rocprofsys
LANGUAGES C CXX
VERSION ${OMNITRACE_VERSION}
DESCRIPTION "CPU/GPU Application tracing with static/dynamic binary instrumentation"
HOMEPAGE_URL "https://github.com/ROCm/omnitrace")
HOMEPAGE_URL "https://github.com/ROCm/rocprofiler-systems")

set(PACKAGE_NAME "rocprof-sys")
set(PACKAGE_NAME_UNDERSCORE "rocprof_sys")

find_package(Git)

Expand Down Expand Up @@ -369,35 +372,40 @@ if(NOT OMNITRACE_USE_ROCPROFILER)
set(OMNITRACE_ROCP_ENV "# ")
endif()

configure_file(
${PROJECT_SOURCE_DIR}/LICENSE
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_NAME}/LICENSE
COPYONLY)

configure_file(
${PROJECT_SOURCE_DIR}/perfetto.cfg
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/perfetto.cfg
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/perfetto.cfg
COPYONLY)

configure_file(
${PROJECT_SOURCE_DIR}/cmake/Templates/setup-env.sh.in
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh @ONLY)
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/setup-env.sh @ONLY)

configure_file(
${PROJECT_SOURCE_DIR}/cmake/Templates/modulefile.in
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}/${OMNITRACE_VERSION}
@ONLY)

install(
FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/setup-env.sh
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/perfetto.cfg
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}
FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/setup-env.sh
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}/perfetto.cfg
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}
COMPONENT setup)

install(
FILES
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}/${OMNITRACE_VERSION}
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PROJECT_NAME}
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}/${OMNITRACE_VERSION}
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/modulefiles/${PACKAGE_NAME}
COMPONENT setup)

install(
FILES ${PROJECT_SOURCE_DIR}/LICENSE
DESTINATION ${CMAKE_INSTALL_DOCDIR}
FILES ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_NAME}/LICENSE
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_NAME}
COMPONENT setup)

# ------------------------------------------------------------------------------#
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Advanced Micro Devices, Inc. All Rights Reserved.
Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading