Remove MSE computation for UINT samples

Improve the handling of non-finite samples
Signed-off-by: Pierre-Anthony Lemieux <pal@palemieux.com>

Author: palemieux

src/bin/exrmetrics/exrmetrics.cpp

@@ -1221,8 +1221,7 @@ exrmetrics (
                  i != outHeaders[p].channels ().end ();
                  ++i, ++channelIndex)
             {
-                if (i.channel ().type != HALF && i.channel ().type != FLOAT &&
-                    i.channel ().type != UINT)
+                if (i.channel ().type != HALF && i.channel ().type != FLOAT)
                     continue;
 
                 uint64_t pixelsInChannel =
@@ -1270,16 +1269,6 @@ exrmetrics (
                         sumSq,
                         count);
                 }
-                else
-                {
-                    metrics.stats[p].mseKind = MSE_LOG_INT;
-                    accumMSE (
-                        reinterpret_cast<const unsigned int*> (origData),
-                        reinterpret_cast<const unsigned int*> (rereadData),
-                        pixelsInChannel,
-                        sumSq,
-                        count);
-                }
             }
 
             metrics.stats[p].mseCount = count;

src/bin/exrmetrics/exrmetrics.h

@@ -49,7 +49,6 @@ enum MSEKind
     MSE_NONE,
     MSE_LOG_HALF,
     MSE_LOG_FLOAT,
-    MSE_LOG_INT
 };
 
 struct partStats

src/bin/exrmetrics/main.cpp

@@ -92,11 +92,10 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
                " --csv                        print output in csv mode. If passes>1, show median timing\n"
                "                              default is JSON mode\n"
                " --passes num                 write and re-read file num times (default 1)\n"
-               " --mse                        compute MSE per part, comparing original vs. re-read after compression.\n"
-               "                              Parts must have uniform channel types. Half and float channels use\n"
-               "                              signed log-space MSE (reported as \"log_mse\"), skipping non-finite\n"
-               "                              original samples; non-finite re-read samples produce NaN. Uint\n"
-               "                              channels use linear MSE (reported as \"mse\").\n"
+               " --mse                        compute LogMSE per part, comparing original vs. re-read after compression.\n"
+               "                              Parts must have uniform half or float channel types. Samples that are non-finite\n"
+               "                              in the original are skipped. Samples that are finite in the original and not finite\n"
+               "                              in the re-read result in Nan."
                "\n"
                "  -h, --help                  print this message\n"
                "  -v                          output progress messages\n"
@@ -406,11 +405,7 @@ jsonStats (
                 if (computeMSE)
                 {
                     out << ",\n";
-                    const char* mseKey =
-                        run.metrics.stats[part].mseKind != MSE_LOG_INT
-                            ? "log_mse"
-                            : "mse";
-                    out << "          \"" << mseKey
+                    out << "          \"" << "log_mse"
                         << "\": " << run.metrics.stats[part].mse;
                 }
                 if (timing)
@@ -497,9 +492,6 @@ csvStats (ostream& out, list<runData>& data, bool outputSizeData, int timing, bo
             {
                 if (p > 0) { out << '|'; }
                 switch (run.metrics.stats[p].mseKind) {
-                    case MSE_LOG_INT:
-                        out << "mse:" << run.metrics.stats[p].mse;
-                        break;
                     case MSE_LOG_HALF:
                     case MSE_LOG_FLOAT:
                         out << "log_mse:" << run.metrics.stats[p].mse;

src/bin/exrmetrics/mseutils.cpp

@@ -22,15 +22,14 @@ accumMSE<half> (
     {
         double a = static_cast<double> (orig[px]);
         double b = static_cast<double> (reread[px]);
+        if (!std::isfinite (a)) { continue; }
         if (!std::isfinite (b)) { count = 0; sumSq = 0.0; return; }
-        if (std::isfinite (a))
-        {
-            double diff = (a < 0 ? -1.0 : 1.0) * (std::log (std::abs (a) + HALF_DENORM_MIN) - LN_HALF_DENORM_MIN) -
-                          (b < 0 ? -1.0 : 1.0) * (std::log (std::abs (b) + HALF_DENORM_MIN) - LN_HALF_DENORM_MIN);
-            sumSq += diff * diff;
-            ++count;
-        }
-    }
+
+        double diff = (a < 0 ? -1.0 : 1.0) * (std::log (std::abs (a) + HALF_DENORM_MIN) - LN_HALF_DENORM_MIN) -
+                        (b < 0 ? -1.0 : 1.0) * (std::log (std::abs (b) + HALF_DENORM_MIN) - LN_HALF_DENORM_MIN);
+        sumSq += diff * diff;
+        ++count;
+}
 }
 
 template <>
@@ -48,30 +47,10 @@ accumMSE<float> (
     {
         double a = static_cast<double> (orig[px]);
         double b = static_cast<double> (reread[px]);
+        if (!std::isfinite (a)) { continue; }
         if (!std::isfinite (b)) { count = 0; sumSq = 0.0; return; }
-        if (std::isfinite (a))
-        {
-            double diff = (a < 0 ? -1.0 : 1.0) * (std::log (std::abs (a) + eps) - ln_eps) -
-                          (b < 0 ? -1.0 : 1.0) * (std::log (std::abs (b) + eps) - ln_eps);
-            sumSq += diff * diff;
-            ++count;
-        }
-    }
-}
-
-template <>
-void
-accumMSE<unsigned int> (
-    const unsigned int* orig,
-    const unsigned int* reread,
-    uint64_t            pixelsInChannel,
-    double&             sumSq,
-    uint64_t&           count)
-{
-    for (uint64_t px = 0; px < pixelsInChannel; ++px)
-    {
-        double diff =
-            static_cast<double> (orig[px]) - static_cast<double> (reread[px]);
+        double diff = (a < 0 ? -1.0 : 1.0) * (std::log (std::abs (a) + eps) - ln_eps) -
+                        (b < 0 ? -1.0 : 1.0) * (std::log (std::abs (b) + eps) - ln_eps);
         sumSq += diff * diff;
         ++count;
     }

src/bin/exrmetrics/mseutils.h

@@ -31,12 +31,4 @@ void accumMSE<float> (
     double&      sumSq,
     uint64_t&    count);
 
-template <>
-void accumMSE<unsigned int> (
-    const unsigned int* orig,
-    const unsigned int* reread,
-    uint64_t            pixelsInChannel,
-    double&             sumSq,
-    uint64_t&           count);
-
 #endif