Install MPI even when USE_MPI=OFF

ROCm · Jul 25, 2022 · df9c874 · df9c874
1 parent 679dff8
commit df9c874
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml
@@ -66,7 +66,7 @@ jobs:
         add-apt-repository -y ppa:ubuntu-toolchain-r/test &&
         apt-get update &&
         apt-get upgrade -y &&
-        apt-get install -y build-essential m4 autoconf libtool python3-pip libiberty-dev clang libomp-dev ${{ matrix.compiler }} &&
+        apt-get install -y build-essential m4 autoconf libtool python3-pip libiberty-dev clang libomp-dev libmpich-dev mpich ${{ matrix.compiler }} &&
         python3 -m pip install --upgrade pip &&
         python3 -m pip install numpy &&
         python3 -m pip install perfetto &&
@@ -206,7 +206,7 @@ jobs:
         wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - &&
         echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${{ matrix.rocm_version }}/ ubuntu main" | tee /etc/apt/sources.list.d/rocm.list &&
         apt-get update &&
-        apt-get install -y build-essential m4 autoconf libtool python3-pip clang libomp-dev ${{ matrix.compiler }} libudev-dev libnuma-dev rocm-dev rocm-utils rocm-smi-lib roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev libpapi-dev libopenmpi-dev curl &&
+        apt-get install -y build-essential m4 autoconf libtool python3-pip clang libomp-dev ${{ matrix.compiler }} libudev-dev libnuma-dev rocm-dev rocm-utils rocm-smi-lib roctracer-dev rocprofiler-dev hip-base hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev libpapi-dev curl libopenmpi-dev openmpi-bin libfabric-dev &&
         python3 -m pip install --upgrade pip &&
         python3 -m pip install 'cmake==3.16.3' &&
         for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install numpy perfetto dataclasses; done

diff --git a/source/lib/omnitrace/library/config.cpp b/source/lib/omnitrace/library/config.cpp
@@ -590,9 +590,9 @@ configure_settings(bool _init)
     }
     if(!_found_sep && _cmd.size() > 1) _cmd.insert(_cmd.begin() + 1, "--");
 
-    auto _pid  = getpid();
-    auto _ppid = getppid();
-    auto _proc = mproc::get_concurrent_processes(_ppid);
+    auto _pid       = getpid();
+    auto _ppid      = getppid();
+    auto _proc      = mproc::get_concurrent_processes(_ppid);
     bool _main_proc = (_proc.size() < 2 || *_proc.begin() == _pid);
 
     for(auto&& itr :
@@ -603,14 +603,16 @@ configure_settings(bool _init)
         _config->read(itr);
         if(_config->get<bool>("OMNITRACE_CI") && _main_proc)
         {
-            std::ifstream _in{ itr };
+            std::ifstream     _in{ itr };
             std::stringstream _iss{};
-            while (_in) {
+            while(_in)
+            {
                 std::string _s{};
                 getline(_in, _s);
                 _iss << _s << "\n";
             }
-            OMNITRACE_BASIC_PRINT("config file '%s':\n%s\n", itr.c_str(), _iss.str().c_str());
+            OMNITRACE_BASIC_PRINT("config file '%s':\n%s\n", itr.c_str(),
+                                  _iss.str().c_str());
         }
     }