refactor: remove SIMG-based image output

- drop the SIMG/SIMG_Frame wrappers and bundled stb image headers
- switch SGLFW and CSGOptiX snapshot output from jpg/png to raw npy buffers
- remove SIMG-dependent tests and the qudarap image rotation test

Author: plexoos

CSGOptiX/CSGOptiX.cc

@@ -1196,7 +1196,7 @@ const char* CSGOptiX::getDefaultSnapPath() const
     assert( foundry );
     const char* cfbase = foundry->getOriginCFBase();
     assert( cfbase );
-    const char* path = SPath::Resolve(cfbase, "CSGOptiX/snap.jpg" , FILEPATH );
+    const char* path = SPath::Resolve(cfbase, "CSGOptiX/snap.npy", FILEPATH);
     return path ;
 }
 
@@ -1297,11 +1297,11 @@ void CSGOptiX::render_save_(const char* stem_, bool inverted)
     const char* stem = stem_ ? stem_ : getRenderStemDefault() ;  // without ext
 
     bool unique = true ;
-    const char* outpath = SEventConfig::OutPath(stem, -1, ".jpg", unique );
+    const char* outpath = SEventConfig::OutPath(stem, -1, ".npy", unique);
 
     LOG(LEVEL)
-          << SEventConfig::DescOutPath(stem, -1, ".jpg", unique );
-          ;
+        << SEventConfig::DescOutPath(stem, -1, ".npy", unique);
+    ;
 
     std::string u_outdir ;
     std::string u_stem ;
@@ -1324,15 +1324,13 @@ void CSGOptiX::render_save_(const char* stem_, bool inverted)
 
     LOG(info) << outpath  << " : " << AnnotationTime(kernel_dt, extra)  ;
 
-    snap(outpath, inverted );
-
+    snap(outpath, inverted);
 
     sglm->save( u_outdir.c_str(), u_stem.c_str() );
 }
 
-
 /**
-CSGOptiX::snap : Download frame pixels and write to file as jpg.
+CSGOptiX::snap : Download frame pixels and write to file as NPY.
 ------------------------------------------------------------------
 
 WIP: contrast this with SGLFW::snap_local and consider if more consolidation is possible
@@ -1346,7 +1344,7 @@ CSGOptiX::snap
 
 **/
 
-void CSGOptiX::snap(const char* path_, bool inverted )
+void CSGOptiX::snap(const char* path_, bool inverted)
 {
     const char* path = path_ ? SPath::Resolve(path_, FILEPATH ) : getDefaultSnapPath() ;
     LOG(LEVEL) << " path " << path ;
@@ -1387,13 +1385,14 @@ int CSGOptiX::render_flightpath() // for making mp4 movies
     return 1 ;
 }
 
-void CSGOptiX::saveMeta(const char* jpg_path) const
+void CSGOptiX::saveMeta(const char* path) const
 {
-    const char* json_path = SStr::ReplaceEnd(jpg_path, ".jpg", ".json");
+    const char* json_path = SStr::ReplaceEnd(path, ".npy", ".json");
     LOG(LEVEL) << "[ json_path " << json_path  ;
 
     nlohmann::json& js = meta->js ;
-    js["jpg"] = jpg_path ;
+    js["path"] = path;
+    js["npy"] = path;
     js["emm"] = SGeoConfig::EnabledMergedMesh() ;
 
     if(foundry->hasMeta())

CSGOptiX/CSGOptiX.h

@@ -177,15 +177,14 @@ struct CSGOPTIX_API CSGOptiX : public SSimulator
     const CSGFoundry* getFoundry() const ;
     static std::string AnnotationTime( double dt, const char* extra=nullptr );
     const char* getDefaultSnapPath() const ;
-    void snap(const char* path, bool inverted );  // part of SRenderer protocol base
-
+    void snap(const char* path, bool inverted); // part of SRenderer protocol base
 
 #ifdef WITH_FRAME_PHOTON
     void writeFramePhoton(const char* dir, const char* name);
 #endif
     int  render_flightpath();
 
-    void saveMeta(const char* jpg_path) const ;
+    void saveMeta(const char* path) const;
 
     static constexpr const char* CTX_LOGNAME = "CSGOptiX__Ctx.log"  ;
     void write_Ctx_log(const char* dir=nullptr) const ;

CSGOptiX/Frame.cc

@@ -7,23 +7,14 @@
 
 #include "SFrameConfig.hh"
 #include "SComp.h"
-#include "SStr.hh"
 #include "SPath.hh"
 #include "SLOG.hh"
 #include "NP.hh"
 #include "Frame.h"
 
-#define SIMG_IMPLEMENTATION 1 
-#include "SIMG.h"
-
 
 const plog::Severity Frame::LEVEL = SLOG::EnvLevel("Frame", "DEBUG" ); 
 
-unsigned Frame::getNumPixels() const 
-{
-    return num_pixels ; 
-}
-
 /**
 Frame::Frame
 --------------
@@ -58,8 +49,6 @@ Frame::Frame(int width_, int height_, int depth_, uchar4* d_pixel_, float4* d_is
     height(height_),
     depth(depth_),
     channels(4),
-    jpg_quality(SStr::GetEValue<int>("QUALITY", 50)),
-    img(new SIMG(width, height, channels,  nullptr )),
     num_pixels(width*height),  
     d_pixel(d_pixel_ == nullptr     ? DeviceAlloc<uchar4>(num_pixels, mask & SCOMP_PIXEL   ) : d_pixel_  ),
     d_isect(d_isect_ == nullptr     ? DeviceAlloc<float4>(num_pixels, mask & SCOMP_ISECT   ) : d_isect_  ),
@@ -107,10 +96,8 @@ void Frame::download_(bool flip_vertical)
     if(d_fphoton) QU::Download<quad4>(photon, d_fphoton, num_pixels ); 
 #endif
 
-    if(d_pixel) 
-    {
-        img->setData( getPixelData(), flip_vertical ); 
-    }
+    if (d_pixel && flip_vertical)
+        flipPixelVertical();
 }
 
 void Frame::download()
@@ -122,41 +109,24 @@ void Frame::download_inverted()
     download_(false); 
 }
 
-
-
-unsigned char* Frame::getPixelData() const {     return d_pixel ? (unsigned char*)pixel.data() : nullptr ; }
 float*         Frame::getIntersectData() const { return d_isect ? (float*)isect.data()         : nullptr ; }
 #ifdef WITH_FRAME_PHOTON
 float*         Frame::getFPhotonData() const {   return d_fphoton ? (float*)fphoton.data()     : nullptr ; }
 #endif
 
-void Frame::write(const char* outdir_, int quality) const 
-{
-    const char* outdir = SPath::Resolve(outdir_, DIRPATH); 
-    writePNG(outdir, "f_pixels.png");  
-    writeJPG(outdir, "f_pixels.jpg", quality);  
-    writeIsect(outdir, "f_isect.npy" ); // formerly posi.npy
-#ifdef WITH_FRAME_PHOTON
-    writeFPhoton(outdir, "f_photon.npy" ); 
-#endif
-}
-
-void Frame::writePNG(const char* dir, const char* name) const 
-{
-    img->writePNG(dir, name); 
-}
-void Frame::writePNG(const char* path) const 
+void Frame::flipPixelVertical()
 {
-    img->writePNG(path); 
+    for (int y = 0; y < height / 2; y++)
+        for (int x = 0; x < width; x++)
+        {
+            std::swap(pixel[y * width + x], pixel[(height - 1 - y) * width + x]);
+        }
 }
 
-void Frame::writeJPG(const char* dir, const char* name, int quality) const 
-{
-    img->writeJPG(dir, name, quality > 0 ? quality : jpg_quality ); 
-}
-void Frame::writeJPG(const char* path, int quality) const 
+void Frame::writePixels(const char* path) const
 {
-    img->writeJPG(path, quality > 0 ? quality : jpg_quality ); 
+    if (d_pixel)
+        NP::Write(path, (unsigned char*)pixel.data(), height, width, channels);
 }
 
 
@@ -176,12 +146,11 @@ void Frame::writeFPhoton( const char* dir, const char* name) const
 
 void Frame::snap( const char* path )
 {
-    LOG(LEVEL) << "[" ; 
-
-    LOG(LEVEL) << "[ writeJPG " ; 
-    writeJPG( path ); 
-    LOG(LEVEL) << "] writeJPG " ; 
+    LOG(LEVEL) << "[";
 
+    LOG(LEVEL) << "[ writePixels ";
+    writePixels(path);
+    LOG(LEVEL) << "] writePixels ";
 
     LOG(LEVEL) << "[ writeIntersectData " ; 
     const char* fold = SPath::Dirname(path); 

CSGOptiX/Frame.h

@@ -15,7 +15,6 @@ HMM: lots of overlap between this and SGLFW
 #include "squad.h"
 #include "plog/Severity.h"
 
-struct SIMG ; 
 #include "CSGOPTIX_API_EXPORT.hh"
 
 struct CSGOPTIX_API Frame
@@ -27,9 +26,7 @@ struct CSGOPTIX_API Frame
     int height ; 
     int depth ; 
     int channels ; 
-    int jpg_quality ; 
 
-    SIMG*      img ; 
     unsigned num_pixels ; 
 
     std::vector<float4> isect ; 
@@ -55,24 +52,14 @@ struct CSGOPTIX_API Frame
     void download_(bool flip_vertical); 
     void download();           // with flip_vertical:true
     void download_inverted();  // with flip_vertical:false
-    void snap(const char* path ); 
+    void snap(const char* path);
 
-private: 
+  private:
+    void flipPixelVertical();
+    void writePixels(const char* path) const;
+    void writeIsect(const char* dir, const char* name) const;
 
-    void write(const char* outdir, int quality=0) const ;
-
-    void writePNG(const char* path) const ;
-    void writePNG(const char* dir, const char* name) const ;
-
-    void writeJPG(const char* path, int quality=0) const ;
-    void writeJPG(const char* dir, const char* name, int quality=0) const ;
-
-    void writeIsect(  const char* dir, const char* name) const ;
-
-
-    unsigned getNumPixels() const ; 
-    unsigned char* getPixelData() const ;
-    float*         getIntersectData() const ;
+    float* getIntersectData() const;
 
 #ifdef WITH_FRAME_PHOTON
     void writeFPhoton( const char* dir, const char* name) const ;

CSGOptiX/tests/CSGOptiXRenderInteractiveTest.cc

@@ -134,12 +134,11 @@ inline void CSGOptiXRenderInteractiveTest::init()
 
 }
 
-
 /**
 CSGOptiXRenderInteractiveTest::handle_snap_cx
 ----------------------------------------------
 
-Saves ray trace geometry screenshots when certain keys pressed.
+Saves ray trace geometry frame dumps when certain keys pressed.
 Formerly done between render_launch and unmap
 
 **/
@@ -219,4 +218,3 @@ int main(int argc, char** argv)
     }
     return 0 ;
 }
-

qudarap/QTexRotate.cc

@@ -38,7 +38,7 @@ void QTexRotate<T>::rotate(float theta)
 
     cudaDeviceSynchronize();
     cudaCheckErrors("cudaDeviceSynchronize");
-    // Fatal error: cudaDeviceSynchronize (linear filtering not supported for non-float type at SIMGStandaloneTest.cu:123)
+    // Fatal error: cudaDeviceSynchronize (linear filtering not supported for non-float type)
 
     if(rotate_dst == nullptr)
     {
@@ -52,4 +52,3 @@ void QTexRotate<T>::rotate(float theta)
 
 template struct QUDARAP_API QTexRotate<uchar4>;
 
-

qudarap/tests/QTexRotateTest.cc

@@ -553,16 +553,6 @@ list(APPEND HEADERS
   ${IPH} 
   ${PYJS}
 ) 
-
-
-set(WITH_SIMG YES)
-if(WITH_SIMG)
-    list(APPEND HEADERS   stb_image.h  stb_image_write.h)   
-    list(APPEND HEADERS   SIMG.h  )   
-    list(APPEND HEADERS   SIMG_Frame.h  )   
-endif()
-
-
 set(WITH_NP YES)