From f9f31d1293f04c2ea421399966d147230541749e Mon Sep 17 00:00:00 2001 From: Mozquito Date: Mon, 30 Oct 2023 09:34:46 +0100 Subject: [PATCH] fix typo --- cuda/harvesting/CudaThresher.cu | 4 +- src/main.cpp | 2 +- src/plotting/Compression.cpp | 104 ++++++-------------------------- 3 files changed, 21 insertions(+), 89 deletions(-) diff --git a/cuda/harvesting/CudaThresher.cu b/cuda/harvesting/CudaThresher.cu index b023290e..31214524 100644 --- a/cuda/harvesting/CudaThresher.cu +++ b/cuda/harvesting/CudaThresher.cu @@ -102,11 +102,11 @@ public: bool AllocateBuffers( const uint k, uint maxCompressionLevel ) override { // Only support C7 max for now - if( maxCompressionLevel > 7 ) + if( maxCompressionLevel > 16 ) return false; // #NOTE: For now we always preallocate for the maximum compression level - maxCompressionLevel = 7; + maxCompressionLevel = 16; if( _maxCompressionLevel >= maxCompressionLevel ) return true; diff --git a/src/main.cpp b/src/main.cpp index 60b70dbe..1bda9d84 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -273,7 +273,7 @@ void ParseCommandLine( GlobalPlotConfig& cfg, IPlotter*& outPlotter, int argc, c } else if( cli.ArgConsume( "ramplot" ) ) { - FatalIf( cfg.compressionLevel > 7, "ramplot currently does not support compression levels greater than 7" ); + FatalIf( cfg.compressionLevel > 16, "ramplot currently does not support compression levels greater than 7" ); plotter = new MemPlotter(); break; diff --git a/src/plotting/Compression.cpp b/src/plotting/Compression.cpp index 1275f14b..50f84446 100644 --- a/src/plotting/Compression.cpp +++ b/src/plotting/Compression.cpp @@ -74,45 +74,23 @@ CompressionInfo GetCompressionInfoForLevel( const uint32 compressionLevel ) switch ( compressionLevel ) { - case 1: return GetCompressionInfoForLevel<1>( info ); break; - case 2: return GetCompressionInfoForLevel<2>( info ); break; - case 3: return GetCompressionInfoForLevel<3>( info ); break; - case 4: return GetCompressionInfoForLevel<4>( info ); break; - case 5: return GetCompressionInfoForLevel<5>( info ); break; - case 6: return GetCompressionInfoForLevel<6>( info ); break; - case 7: return GetCompressionInfoForLevel<7>( info ); break; - case 8: return GetCompressionInfoForLevel<8>( info ); break; - case 9: return GetCompressionInfoForLevel<9>( info ); break; - case 10: return GetCompressionInfoForLevel<10>( info ); break; - case 11: return GetCompressionInfoForLevel<11>( info ); break; - case 12: return GetCompressionInfoForLevel<12>( info ); break; - case 13: return GetCompressionInfoForLevel<13>( info ); break; - case 14: return GetCompressionInfoForLevel<14>( info ); break; - case 15: return GetCompressionInfoForLevel<15>( info ); break; - case 16: return GetCompressionInfoForLevel<16>( info ); break; - case 17: return GetCompressionInfoForLevel<17>( info ); break; - case 18: return GetCompressionInfoForLevel<18>( info ); break; - case 19: return GetCompressionInfoForLevel<19>( info ); break; - case 20: return GetCompressionInfoForLevel<20>( info ); break; - case 21: return GetCompressionInfoForLevel<21>( info ); break; - case 22: return GetCompressionInfoForLevel<22>( info ); break; - case 23: return GetCompressionInfoForLevel<23>( info ); break; - case 24: return GetCompressionInfoForLevel<24>( info ); break; - case 25: return GetCompressionInfoForLevel<25>( info ); break; - case 26: return GetCompressionInfoForLevel<26>( info ); break; - case 27: return GetCompressionInfoForLevel<27>( info ); break; - case 28: return GetCompressionInfoForLevel<28>( info ); break; - case 29: return GetCompressionInfoForLevel<29>( info ); break; - case 30: return GetCompressionInfoForLevel<30>( info ); break; - case 31: return GetCompressionInfoForLevel<31>( info ); break; - case 32: return GetCompressionInfoForLevel<32>( info ); break; - case 33: return GetCompressionInfoForLevel<33>( info ); break; - case 34: return GetCompressionInfoForLevel<34>( info ); break; - case 35: return GetCompressionInfoForLevel<35>( info ); break; - case 36: return GetCompressionInfoForLevel<36>( info ); break; - case 37: return GetCompressionInfoForLevel<37>( info ); break; - case 38: return GetCompressionInfoForLevel<38>( info ); break; - case 39: return GetCompressionInfoForLevel<39>( info ); break; + case 1: GetCompressionInfoForLevel<1>( info ); break; + case 2: GetCompressionInfoForLevel<2>( info ); break; + case 3: GetCompressionInfoForLevel<3>( info ); break; + case 4: GetCompressionInfoForLevel<4>( info ); break; + case 5: GetCompressionInfoForLevel<5>( info ); break; + case 6: GetCompressionInfoForLevel<6>( info ); break; + case 7: GetCompressionInfoForLevel<7>( info ); break; + case 8: GetCompressionInfoForLevel<8>( info ); break; + case 9: GetCompressionInfoForLevel<9>( info ); break; + case 10: GetCompressionInfoForLevel<10>( info ); break; + case 11: GetCompressionInfoForLevel<11>( info ); break; + case 12: GetCompressionInfoForLevel<12>( info ); break; + case 13: GetCompressionInfoForLevel<13>( info ); break; + case 14: GetCompressionInfoForLevel<14>( info ); break; + case 15: GetCompressionInfoForLevel<15>( info ); break; + case 16: GetCompressionInfoForLevel<16>( info ); break; + default: Fatal( "Invalid compression level %u.", compressionLevel ); break; @@ -142,29 +120,6 @@ void* CreateCompressionTable( const uint32 compressionLevel, size_t* outTableSiz case 14: return CreateCompressionCTable<14>( outTableSize, compress ); case 15: return CreateCompressionCTable<15>( outTableSize, compress ); case 16: return CreateCompressionCTable<16>( outTableSize, compress ); - case 17: return CreateCompressionCTable<17>( outTableSize, compress ); - case 18: return CreateCompressionCTable<18>( outTableSize, compress ); - case 19: return CreateCompressionCTable<19>( outTableSize, compress ); - case 20: return CreateCompressionCTable<20>( outTableSize, compress ); - case 21: return CreateCompressionCTable<21>( outTableSize, compress ); - case 22: return CreateCompressionCTable<22>( outTableSize, compress ); - case 23: return CreateCompressionCTable<23>( outTableSize, compress ); - case 24: return CreateCompressionCTable<24>( outTableSize, compress ); - case 25: return CreateCompressionCTable<25>( outTableSize, compress ); - case 26: return CreateCompressionCTable<26>( outTableSize, compress ); - case 27: return CreateCompressionCTable<27>( outTableSize, compress ); - case 28: return CreateCompressionCTable<28>( outTableSize, compress ); - case 29: return CreateCompressionCTable<29>( outTableSize, compress ); - case 30: return CreateCompressionCTable<30>( outTableSize, compress ); - case 31: return CreateCompressionCTable<31>( outTableSize, compress ); - case 32: return CreateCompressionCTable<32>( outTableSize, compress ); - case 33: return CreateCompressionCTable<33>( outTableSize, compress ); - case 34: return CreateCompressionCTable<34>( outTableSize, compress ); - case 35: return CreateCompressionCTable<35>( outTableSize, compress ); - case 36: return CreateCompressionCTable<36>( outTableSize, compress ); - case 37: return CreateCompressionCTable<37>( outTableSize, compress ); - case 38: return CreateCompressionCTable<38>( outTableSize, compress ); - case 39: return CreateCompressionCTable<39>( outTableSize, compress ); default: break; @@ -221,30 +176,7 @@ size_t GetLargestCompressedParkSize() GetCompressionInfoForLevel( 13 ).tableParkSize, GetCompressionInfoForLevel( 14 ).tableParkSize, GetCompressionInfoForLevel( 15 ).tableParkSize, - GetCompressionInfoForLevel( 16 ).tableParkSize, - GetCompressionInfoForLevel( 17 ).tableParkSize, - GetCompressionInfoForLevel( 18 ).tableParkSize, - GetCompressionInfoForLevel( 19 ).tableParkSize, - GetCompressionInfoForLevel( 20 ).tableParkSize, - GetCompressionInfoForLevel( 21 ).tableParkSize, - GetCompressionInfoForLevel( 22 ).tableParkSize, - GetCompressionInfoForLevel( 23 ).tableParkSize, - GetCompressionInfoForLevel( 24 ).tableParkSize, - GetCompressionInfoForLevel( 25 ).tableParkSize, - GetCompressionInfoForLevel( 26 ).tableParkSize, - GetCompressionInfoForLevel( 27 ).tableParkSize, - GetCompressionInfoForLevel( 28 ).tableParkSize, - GetCompressionInfoForLevel( 29 ).tableParkSize, - GetCompressionInfoForLevel( 30 ).tableParkSize, - GetCompressionInfoForLevel( 31 ).tableParkSize, - GetCompressionInfoForLevel( 32 ).tableParkSize, - GetCompressionInfoForLevel( 33 ).tableParkSize, - GetCompressionInfoForLevel( 34 ).tableParkSize, - GetCompressionInfoForLevel( 35 ).tableParkSize, - GetCompressionInfoForLevel( 36 ).tableParkSize, - GetCompressionInfoForLevel( 37 ).tableParkSize, - GetCompressionInfoForLevel( 38 ).tableParkSize, - GetCompressionInfoForLevel( 39 ).tableParkSize + GetCompressionInfoForLevel( 16 ).tableParkSize } ); } \ No newline at end of file