Fix conflict.

ROCm · Oct 19, 2024 · e018ec0 · e018ec0
2 parents ea1d786 + ad6f025
commit e018ec0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,3 +4,10 @@
 docs/ @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
 *.rst @ROCm/rocm-documentation
+.readthedocs.yaml @ROCm/rocm-documentation
+
+# Packaging
+cmake/ @koomie
+tests/ @koomie
+CMakeLists.txt @koomie
+utils/ @koomie
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -64,43 +64,43 @@ jobs:
         run:  tar xfz rocprofiler-compute-*.tar.gz; rm rocprofiler-compute-*.tar.gz
       - name: Python dependency installs
         run: |
-          cd rocprof-compute-*
+          cd rocprofiler-compute-*
           python3 -m pip install -t${INSTALL_DIR}/python-libs -r requirements.txt
       - name: Configure
         run:  |
-          cd rocprof-compute-*
+          cd rocprofiler-compute-*
           mkdir build
           cd build
-          cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}/rocprof-compute \
+          cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}/rocprofiler-compute \
             -DPYTHON_DEPS=${INSTALL_DIR}/python-libs ..
       - name: Install
         run:  |
-          cd rocprof-compute-*
+          cd rocprofiler-compute-*
           cd build
           make install
       - name: Verify expected paths
         run: |
           # find $INSTALL_DIR
-          test -d $INSTALL_DIR/rocprof-compute
-          test -x $INSTALL_DIR/rocprof-compute/bin/rocprofiler-compute
-          test -s $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/VERSION
-          test -s $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/VERSION.sha
-          test -d $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/rocprof_compute_analyze
-          test -d $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/rocprof_compute_profile
-          test -d $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/rocprof_compute_soc
-          test -d $INSTALL_DIR/rocprof-compute/libexec/rocprofiler-compute/utils
-          test -s $INSTALL_DIR/rocprof-compute/share/rocprofiler-compute/sample/vcopy.cpp
-          test -d $INSTALL_DIR/rocprof-compute/share/rocprofiler-compute/modulefiles
+          test -d $INSTALL_DIR/rocprofiler-compute
+          test -x $INSTALL_DIR/rocprofiler-compute/bin/rocprofiler-compute
+          test -s $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/VERSION
+          test -s $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/VERSION.sha
+          test -d $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/rocprof_compute_analyze
+          test -d $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/rocprof_compute_profile
+          test -d $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/rocprof_compute_soc
+          test -d $INSTALL_DIR/rocprofiler-compute/libexec/rocprofiler-compute/utils
+          test -s $INSTALL_DIR/rocprofiler-compute/share/rocprofiler-compute/sample/vcopy.cpp
+          test -d $INSTALL_DIR/rocprofiler-compute/share/rocprofiler-compute/modulefiles
       - name: Query version (setting PYTHONPATH by hand)
         run: |
           export PYTHONPATH=${INSTALL_DIR}/python-libs:$PYTHONPATH
-          $INSTALL_DIR/rocprof-compute/bin/rocprof-compute --version
+          $INSTALL_DIR/rocprofiler-compute/bin/rocprof-compute --version
       - name: Install Lmod
         run: sudo apt-get install -y lmod
-      - name: Access rocprof-compute using modulefile
+      - name: Access rocprofiler-compute using modulefile
         run: |
           . /etc/profile.d/lmod.sh
-          module use $INSTALL_DIR/rocprof-compute/share/rocprofiler-compute/modulefiles
+          module use $INSTALL_DIR/rocprofiler-compute/share/rocprofiler-compute/modulefiles
           module load rocprofiler-compute
           module list
           rocprof-compute --version

diff --git a/docs/install/grafana-setup.rst b/docs/install/grafana-setup.rst
@@ -79,6 +79,19 @@ directory to begin.
    $ sudo docker-compose build
    $ sudo docker-compose up -d
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+.. note::
+
+   To troubleshoot Docker container build failures related to certificate verification, try 
+   disabling any network proxy services on the host system. These proxy services can interfere 
+   with OpenSSL's ability to retrieve a correct certificate chain when the container accesses 
+   external websites.
+
+=======
+>>>>>>> 0e7085ccccbe27f9a804e1f5c9237026213d9da2
+>>>>>>> ad6f025f6ad34911d9d6eb9e685bacc9278c75f6
 The TCP ports for Grafana (``4000``) and MongoDB (``27017``) in the Docker
 container are mapped to ``14000`` and ``27018``, respectively, on the host side.