ROCclr icon indicating copy to clipboard operation
ROCclr copied to clipboard

Debian packaging: typo patch

Open Maxzor opened this issue 3 years ago • 6 comments

Dear all, please accept this typo patch. Best regards, Maxime

This is a matter in your clr directory of : patch < file.patch

Maxzor avatar Jan 02 '22 02:01 Maxzor

From: Maxime Chambonnet <[email protected]>
Date: Sat, 1 Jan 2022 22:28:54 +0100
Subject: ROC CLR typos
 
Forwarded: yes

---
 clr/device/device.cpp          | 2 +-
 clr/device/devprogram.cpp      | 4 ++--
 clr/device/devwavelimiter.cpp  | 4 ++--
 clr/device/rocm/rocprogram.cpp | 2 +-
 clr/device/rocm/rocvirtual.cpp | 4 ++--
 clr/os/os_posix.cpp            | 2 +-
 clr/platform/runtime.cpp       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/device/device.cpp b/device/device.cpp
index d651784..0176e6a 100644
--- a/device/device.cpp
+++ b/device/device.cpp
@@ -1098,7 +1098,7 @@ bool ClBinary::setElfOut(unsigned char eclass,
       delete elfOut_;
       elfOut_ = nullptr;
     }
-    LogError("Creating ouput ELF object failed");
+    LogError("Creating output ELF object failed");
     return false;
   }
 
diff --git a/device/devprogram.cpp b/device/devprogram.cpp
index 1514262..646b795 100644
--- a/device/devprogram.cpp
+++ b/device/devprogram.cpp
@@ -349,7 +349,7 @@ bool Program::linkLLVMBitcode(const amd_comgr_data_set_t inputs,
   amd_comgr_language_t langver;
   setLanguage(amdOptions->oVariables->CLStd, &langver);
   if (langver == AMD_COMGR_LANGUAGE_NONE) {
-    DevLogPrintfError("Cannot set Langauge version for %s \n",
+    DevLogPrintfError("Cannot set Language version for %s \n",
                       amdOptions->oVariables->CLStd);
     return false;
   }
@@ -407,7 +407,7 @@ bool Program::compileToLLVMBitcode(const amd_comgr_data_set_t compileInputs,
   amd_comgr_language_t langver;
   setLanguage(amdOptions->oVariables->CLStd, &langver);
   if (langver == AMD_COMGR_LANGUAGE_NONE) {
-    DevLogPrintfError("Cannot set Langauge version for %s \n",
+    DevLogPrintfError("Cannot set Language version for %s \n",
                       amdOptions->oVariables->CLStd);
     return false;
   }
diff --git a/device/devwavelimiter.cpp b/device/devwavelimiter.cpp
index 4180cfd..beec1bc 100644
--- a/device/devwavelimiter.cpp
+++ b/device/devwavelimiter.cpp
@@ -125,9 +125,9 @@ void WLAlgorithmSmooth::outputTrace() {
   traceStream_ << "[WaveLimiter] " << manager_->name() << " state=" << state_ <<
     " waves=" << waves_ << " bestWave=" << bestWave_ << " worstWave=" << worstWave_ << '\n';
   output(traceStream_, "\n adaptive measure = ", adpMeasure_);
-  output(traceStream_, "\n adaptive smaple count = ", adpSampleCnt_);
+  output(traceStream_, "\n adaptive sample count = ", adpSampleCnt_);
   output(traceStream_, "\n run measure = ", runMeasure_);
-  output(traceStream_, "\n run smaple count = ", runSampleCnt_);
+  output(traceStream_, "\n run sample count = ", runSampleCnt_);
   traceStream_ << "\n % time from the previous runs to the best wave: ";
   float min = static_cast<float>(adpMeasure_[bestWave_]) / adpSampleCnt_[bestWave_];
   for (uint i = 0; i < (MaxWave + 1); ++i) {
diff --git a/device/rocm/rocprogram.cpp b/device/rocm/rocprogram.cpp
index 32aed3d..dda17e0 100644
--- a/device/rocm/rocprogram.cpp
+++ b/device/rocm/rocprogram.cpp
@@ -250,7 +250,7 @@ bool LightningProgram::saveBinaryAndSetType(type_t type, void* rawBinary, size_t
   }
   else {  // handle LLVM binary
     if (llvmBinary_.empty()) {
-      buildLog_ += "ERROR: Tried to save emtpy LLVM binary \n";
+      buildLog_ += "ERROR: Tried to save empty LLVM binary \n";
       return false;
     }
     rawBinary = (void*)llvmBinary_.data();
diff --git a/device/rocm/rocvirtual.cpp b/device/rocm/rocvirtual.cpp
index 93d9155..efd8a41 100644
--- a/device/rocm/rocvirtual.cpp
+++ b/device/rocm/rocvirtual.cpp
@@ -395,10 +395,10 @@ hsa_signal_t VirtualGPU::HwQueueTracker::ActiveSignal(
         signal_list_[current_id_]->release();
         signal_list_[current_id_] = signal.release();
       } else {
-        assert(!"ProfilingSignal reallocaiton failed! Marker has a conflict with signal reuse!");
+        assert(!"ProfilingSignal reallocation failed! Marker has a conflict with signal reuse!");
       }
     } else {
-      assert(!"ProfilingSignal reallocaiton failed! Marker has a conflict with signal reuse!");
+      assert(!"ProfilingSignal reallocation failed! Marker has a conflict with signal reuse!");
     }
   }
   ProfilingSignal* prof_signal = signal_list_[current_id_];
diff --git a/os/os_posix.cpp b/os/os_posix.cpp
index 04b2f71..2befe14 100644
--- a/os/os_posix.cpp
+++ b/os/os_posix.cpp
@@ -372,7 +372,7 @@ const void* Os::createOsThread(amd::Thread* thread) {
   // We never plan the use join, so free the resources now.
   ::pthread_attr_setdetachstate(&threadAttr, PTHREAD_CREATE_DETACHED);
   if (!AMD_CPU_AFFINITY) {
-    ClPrint(amd::LOG_INFO, amd::LOG_INIT, "Reseting CPU core affinities");
+    ClPrint(amd::LOG_INFO, amd::LOG_INIT, "Resetting CPU core affinities");
     cpu_set_t cpuset;
     if (processorCount_ > 0) {
       CPU_ZERO(&cpuset);
diff --git a/platform/runtime.cpp b/platform/runtime.cpp
index 63dfa37..88fc666 100644
--- a/platform/runtime.cpp
+++ b/platform/runtime.cpp
@@ -74,7 +74,7 @@ bool Runtime::init() {
   if (!Flag::init() || !option::init() || !Device::init()
       // Agent initializes last
       || !Agent::init()) {
-    ClPrint(LOG_ERROR, LOG_INIT, "Runtime initilization failed");
+    ClPrint(LOG_ERROR, LOG_INIT, "Runtime initialization failed");
     return false;
   }
 

Maxzor avatar Jan 02 '22 02:01 Maxzor

Thanks Maxime, I send this for internal review, it should get mirror back here shortly after it's reviewed.

Mystro256 avatar Apr 11 '22 16:04 Mystro256

I just merged this internally, I'm not sure how long it will take to mirror onto github :)

Mystro256 avatar Apr 11 '22 18:04 Mystro256

Hi, thanks for having applied Maxime's patch. I could remove the corresponding debian patch while working on bumping hipcc to ROCm 5.2.3. Note I caught the below typo in the meantime:

--- a/compiler/lib/utils/OPTIONS.def
+++ b/compiler/lib/utils/OPTIONS.def
@@ -319,7 +319,7 @@
         "I", NULL, \
         PP_I, \
         0, 0, 0, NULL, \
-        "Add directroy dir for header file search")
+        "Add directory dir for header file search")
 
 // -create-library
 OPTION(OT_BOOL, \

in hope this helps, Have a nice day! :)

emollier avatar Sep 07 '22 20:09 emollier

Hi, thanks for having applied Maxime's patch. I could remove the corresponding debian patch while working on bumping hipcc to ROCm 5.2.3. Note I caught the below typo in the meantime:

--- a/compiler/lib/utils/OPTIONS.def
+++ b/compiler/lib/utils/OPTIONS.def
@@ -319,7 +319,7 @@
         "I", NULL, \
         PP_I, \
         0, 0, 0, NULL, \
-        "Add directroy dir for header file search")
+        "Add directory dir for header file search")
 
 // -create-library
 OPTION(OT_BOOL, \

in hope this helps, Have a nice day! :)

Thanks! I'll sent this patch for review.

EDIT: note that it's reviewed/merged internally into the "develop" branch, then mirrored on github closer to next release, which is why it can take some time to show up.

Mystro256 avatar Sep 08 '22 14:09 Mystro256

FYI, this was merged internally, I expect it to be mirrored on here on the develop branch within the next few weeks.

I think they sync the develop branch when a new release comes out.

Mystro256 avatar Sep 30 '22 14:09 Mystro256