Updated manylinux build images

.github/workflows/build-release.yml

@@ -11,7 +11,7 @@ jobs:
   build-harvester-linux-x86-64:
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/chia-network/build-images/manylinux2014_cuda_x86_64:sha-1caf046d5ff19b7c743de2a106dd86928794032b
+      image: ghcr.io/chia-network/build-images/manylinux_cuda_x86_64:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -105,7 +105,7 @@ jobs:
   build-harvester-linux-arm64:
     runs-on: [ARM64, Linux]
     container:
-      image: ghcr.io/chia-network/build-images/manylinux2014_cuda_aarch64:sha-1caf046d5ff19b7c743de2a106dd86928794032b
+      image: ghcr.io/chia-network/build-images/manylinux_cuda_aarch64:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -195,7 +195,7 @@ jobs:
           if-no-files-found: error
 
   build-harvester-macos-x86-64:
-    runs-on: macOS-11
+    runs-on: macOS-12
     steps:
       - name: Cleanup Environment
         uses: Chia-Network/actions/clean-workspace@main
@@ -279,7 +279,7 @@ jobs:
   build-bladebit-centos-x86-64:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/centos/centos:stream8
+      image: chianetwork/rocky8-builder:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -339,7 +339,7 @@ jobs:
   build-bladebit-centos-arm64:
     runs-on: [ARM64, Linux]
     container:
-      image: quay.io/centos/centos:stream8
+      image: chianetwork/rocky8-builder:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.vscode/launch.json

@@ -137,7 +137,11 @@
             // "--memo", "80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef207d52406afa2b6d7d92ea778f407205bd9dca40816c1b1cacfca2a6612b93eb",
 
             "args":
-            "-w -n 1 -z 1 -f ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef -p 80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8 -i c6b84729c23dc6d60c92f22c17083f47845c1179227c5509f07a5d2804a7b835 cudaplot --check 100 --check-threshold 2 /home/harold/plot",
+
+            // List devices
+            "-w -n 1 -z 1 -f ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef -p 80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8 cudaplot -l",
+
+            // "-w -n 1 -z 1 -f ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef -p 80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8 -i c6b84729c23dc6d60c92f22c17083f47845c1179227c5509f07a5d2804a7b835 cudaplot --check 100 --check-threshold 2 /home/harold/plot",
 
             // "-w -z 1 -f ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef -p 80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8 -i c6b84729c23dc6d60c92f22c17083f47845c1179227c5509f07a5d2804a7b835 cudaplot /home/harold/plot",
             // "-w -z 1 -f ade0cc43610ce7540ab96a524d0ab17f5df7866ef13d1221a7203e5d10ad2a4ae37f7b73f6cdfd6ddf4122e8a1c2f8ef -p 80a836a74b077cabaca7a76d1c3c9f269f7f3a8f2fa196a65ee8953eb81274eb8b7328d474982617af5a0fe71b47e9b8 -i c6b84729c23dc6d60c92f22c17083f47845c1179227c5509f07a5d2804a7b835 cudaplot --disk-128 -t1 /home/harold/plotdisk --no-direct-buffers /home/harold/plot",

cuda/CudaPlotter.cu

@@ -47,6 +47,7 @@ static void UploadBucketToGpu( CudaK32PlotContext& context, TableId table, const
 static void LoadAndSortBucket( CudaK32PlotContext& cx, const uint32 bucket );
 
 void CudaMatchBucketizedK32( CudaK32PlotContext& cx, const uint32* devY, cudaStream_t stream, cudaEvent_t event );
+[[noreturn]] static void ListCudaDevices( bool json );
 
 // Defined in FxCuda.cu
 void GenFx( CudaK32PlotContext& cx, const uint32* devYIn, const uint32* devMetaIn, cudaStream_t stream );
@@ -59,6 +60,11 @@ GPU-based (CUDA) plotter
  -h, --help           : Shows this help message and exits.
  -d, --device         : Select the CUDA device index. (default=0)
 
+ -l, --list           : List availabe CUDA devices, showing their indices.
+
+ --json               : Show output in json format. This is only valid for certain parameters:
+                          --list
+
  --disk-128           : Enable hybrid disk plotting for 128G system RAM. 
                          Requires a --temp1 and --temp2 to be set.
 
@@ -95,6 +101,9 @@ void CudaK32Plotter::ParseCLI( const GlobalPlotConfig& gCfg, CliParser& cli )
     CudaK32PlotConfig& cfg = _cfg;
     cfg.gCfg = &gCfg;
 
+    bool listDevices = false;
+    bool json        = false;
+
     while( cli.HasArgs() )
     {
         if( cli.ReadU32( cfg.deviceIndex, "-d", "--device" ) )
@@ -127,6 +136,10 @@ void CudaK32Plotter::ParseCLI( const GlobalPlotConfig& gCfg, CliParser& cli )
             continue;
         if( cli.ReadF64( cfg.plotCheckThreshhold, "--check-threshold" ) )
             continue;
+        if( cli.ReadSwitch( json, "--json" ) )
+            continue;
+        if( cli.ReadSwitch( listDevices, "-l", "--list" ) )
+            continue;
         // if( cli.ReadSwitch( cfg.disableDirectDownloads, "--no-direct-buffers" ) )
         //     continue;
         if( cli.ArgMatch( "--help", "-h" ) )
@@ -139,6 +152,8 @@ void CudaK32Plotter::ParseCLI( const GlobalPlotConfig& gCfg, CliParser& cli )
     }
     // The rest should be output directies, parsed by the global config parser.
 
+    if( listDevices )
+        ListCudaDevices( json );
 
     if( cfg.hybrid128Mode && gCfg.compressionLevel <= 0 )
     {
@@ -347,6 +362,64 @@ void CudaInit( CudaK32PlotContext& cx )
     //FatalIf( supportsCoopLaunch != 1, "This CUDA device does not support cooperative kernel launches." );
 }
 
+//-----------------------------------------------------------
+void ListCudaDevices( const bool json )
+{
+    cudaError_t err         = cudaSuccess;
+    int         deviceCount = 0;
+
+    #define CheckCudaSuccess( x ) if( (err = x) != cudaSuccess ) goto CUDA_ERROR_EXIT;
+
+    {
+        CheckCudaSuccess( cudaGetDeviceCount( &deviceCount ) );
+
+        if( deviceCount < 1 )
+        {
+            const char* e = "No CUDA devices available.";
+            if( json )
+                Log::Line( R"({"error": "%s"})", e );
+            else
+                Log::Line( e );
+            exit(0);
+        }
+
+        if( json )
+            Log::Line("[");
+
+        for( int i = 0; i < deviceCount; i++ )
+        {
+            cudaDeviceProp cudaDevProps{};
+            CheckCudaSuccess( cudaGetDeviceProperties( &cudaDevProps, i ) );
+
+            if( json )
+            {
+                Log::Write( R"(  {"id": %d, "name": "%s"})", i, cudaDevProps.name );
+                if( i+1 < deviceCount )
+                    Log::Write( "," );
+
+                Log::NewLine();
+            }
+            else
+                Log::Line( "%-2d: %s", i, cudaDevProps.name );
+        }
+
+        if( json )
+            Log::Line("]");
+
+        exit(0);
+    }
+
+    #undef CheckCudaSuccess
+    CUDA_ERROR_EXIT:
+
+    if( json )
+        Log::Error( R"({ "error": "Failed to list CUDA devices with error 0x%llx: '%s'"})", (llu)err, cudaGetErrorString( err ) );
+    else
+        Log::Error( "Failed to list CUDA devices with error 0x%llx: '%s'.", (llu)err, cudaGetErrorString( err ) );
+
+    exit(1);
+}
+
 
 ///
 /// Plotting entry point

src/commands/CmdSimulator.cpp

@@ -92,6 +92,7 @@ void CmdSimulateMain( GlobalPlotConfig& gCfg, CliParser& cli )
         else if( cli.ReadSize( cfg.farmSize, "-s", "--size" ) ) continue;
         else if( cli.ReadHexStrAsBytes( cfg.randomSeed, sizeof( cfg.randomSeed ), "--seed" ) ) continue;
         else if( cli.ReadSwitch( cfg.noCuda, "--no-cuda" ) ) continue;
+        else if( cli.ReadI32( cfg.cudaDevice, "-d", "--device" ) ) continue;
         else
             break;
     }