Merge pull request #2754 from nicehash/master_vramLimitFix

alanH1998 · web-flow · commit 6b952f4a7f2b · 2022-09-08T07:42:13.000+02:00
adjusted vrams for etchash
diff --git a/src/Miners/LolMiner/LolMinerPlugin.PluginSupportedAlgorithms.cs b/src/Miners/LolMiner/LolMinerPlugin.PluginSupportedAlgorithms.cs
@@ -20,7 +20,7 @@ internal static List<SAS> SupportedAMDAlgos()
                         new SAS(AlgorithmType.BeamV3) { NonDefaultRAMLimit = AMD_3GBMemory },
                         new SAS(AlgorithmType.DaggerHashimoto),
                         new SAS(AlgorithmType.ZelHash),
-                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  4UL << 30 }
+                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  (4UL << 29) + (5UL << 28) + (1UL << 26)}
                     };
         }
 
@@ -61,7 +61,7 @@ internal static List<SAS> SupportedNVIDIAOpenCLAlgos(bool enabled = false)
                         new SAS(AlgorithmType.BeamV3),
                         new SAS(AlgorithmType.DaggerHashimoto),
                         new SAS(AlgorithmType.ZelHash),
-                        new SAS(AlgorithmType.EtcHash){NonDefaultRAMLimit =  4UL << 30 }
+                        new SAS(AlgorithmType.EtcHash){NonDefaultRAMLimit =  (4UL << 29) + (5UL << 28) + (1UL << 26) }
                     }
                 },
                 {
diff --git a/src/Miners/LolMiner/LolMinerPlugin.cs b/src/Miners/LolMiner/LolMinerPlugin.cs
@@ -40,7 +40,7 @@ public LolMinerPlugin()
             };
         }
 
-        public override Version Version => new Version(18, 0);
+        public override Version Version => new Version(18, 1);
 
         public override string Author => "info@nicehash.com";
 
diff --git a/src/Miners/NBMiner/NBMinerPlugin.PluginSupportedAlgorithms.cs b/src/Miners/NBMiner/NBMinerPlugin.PluginSupportedAlgorithms.cs
@@ -30,7 +30,7 @@ public partial class NBMinerPlugin
                         new SAS(AlgorithmType.BeamV3),
                         new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},
                         new SAS(AlgorithmType.Autolykos),
-                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  4UL << 30 },
+                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  (4UL << 29) + (5UL << 28) + (1UL << 26) },
                     }
                 },
                 {
@@ -40,7 +40,7 @@ public partial class NBMinerPlugin
                         new SAS(AlgorithmType.KAWPOW) {NonDefaultRAMLimit = KAWPOW_RamLimit },
                         new SAS(AlgorithmType.DaggerHashimoto),
                         new SAS(AlgorithmType.Autolykos),
-                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  4UL << 30 }
+                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  (4UL << 29) + (5UL << 28) + (1UL << 26) }
                         //new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},
                     }
                 }
diff --git a/src/Miners/NBMiner/NBMinerPlugin.cs b/src/Miners/NBMiner/NBMinerPlugin.cs
@@ -46,7 +46,7 @@ public NBMinerPlugin()
         public override string PluginUUID => "f683f550-94eb-11ea-a64d-17be303ea466";
         public override string Name => "NBMiner";
 
-        public override Version Version => new Version(18, 0);
+        public override Version Version => new Version(18, 1);
         
 
         public override string Author => "info@nicehash.com";
diff --git a/src/Miners/NanoMiner/NanoMinerPlugin.PluginSupportedAlgorithms.cs b/src/Miners/NanoMiner/NanoMinerPlugin.PluginSupportedAlgorithms.cs
@@ -19,7 +19,7 @@ public partial class NanoMinerPlugin
                         new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },
                         new SAS(AlgorithmType.DaggerHashimoto),
                         new SAS(AlgorithmType.Autolykos),
-                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  4UL << 30 }
+                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) }
                     }
                 },
                 {
@@ -30,7 +30,7 @@ public partial class NanoMinerPlugin
                         new SAS(AlgorithmType.Octopus),
                         new SAS(AlgorithmType.DaggerHashimoto),
                         new SAS(AlgorithmType.Autolykos),
-                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  4UL << 30 }
+                        new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit =  (4UL << 29) + (5UL << 28) + (1UL << 26) }
                     }
                 }
             },
diff --git a/src/Miners/NanoMiner/NanoMinerPlugin.cs b/src/Miners/NanoMiner/NanoMinerPlugin.cs
@@ -42,7 +42,7 @@ public NanoMinerPlugin()
 
         public override string Name => "NanoMiner";
 
-        public override Version Version => new Version(18, 0);
+        public override Version Version => new Version(18, 1);
 
         public override string Author => "info@nicehash.com";
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal static List<SAS> SupportedAMDAlgos()`
`20`	`20`	`new SAS(AlgorithmType.BeamV3) { NonDefaultRAMLimit = AMD_3GBMemory },`
`21`	`21`	`new SAS(AlgorithmType.DaggerHashimoto),`
`22`	`22`	`new SAS(AlgorithmType.ZelHash),`
`23`		`- new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = 4UL << 30 }`
	`23`	`+ new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26)}`
`24`	`24`	`};`
`25`	`25`	`}`
`26`	`26`
`@@ -61,7 +61,7 @@ internal static List<SAS> SupportedNVIDIAOpenCLAlgos(bool enabled = false)`
`61`	`61`	`new SAS(AlgorithmType.BeamV3),`
`62`	`62`	`new SAS(AlgorithmType.DaggerHashimoto),`
`63`	`63`	`new SAS(AlgorithmType.ZelHash),`
`64`		`- new SAS(AlgorithmType.EtcHash){NonDefaultRAMLimit = 4UL << 30 }`
	`64`	`+ new SAS(AlgorithmType.EtcHash){NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) }`
`65`	`65`	`}`
`66`	`66`	`},`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public LolMinerPlugin()`
`40`	`40`	`};`
`41`	`41`	`}`
`42`	`42`
`43`		`- public override Version Version => new Version(18, 0);`
	`43`	`+ public override Version Version => new Version(18, 1);`
`44`	`44`
`45`	`45`	`public override string Author => "info@nicehash.com";`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public partial class NBMinerPlugin`
`30`	`30`	`new SAS(AlgorithmType.BeamV3),`
`31`	`31`	`new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},`
`32`	`32`	`new SAS(AlgorithmType.Autolykos),`
`33`		`- new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = 4UL << 30 },`
	`33`	`+ new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) },`
`34`	`34`	`}`
`35`	`35`	`},`
`36`	`36`	`{`
`@@ -40,7 +40,7 @@ public partial class NBMinerPlugin`
`40`	`40`	`new SAS(AlgorithmType.KAWPOW) {NonDefaultRAMLimit = KAWPOW_RamLimit },`
`41`	`41`	`new SAS(AlgorithmType.DaggerHashimoto),`
`42`	`42`	`new SAS(AlgorithmType.Autolykos),`
`43`		`- new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = 4UL << 30 }`
	`43`	`+ new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) }`
`44`	`44`	`//new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public partial class NanoMinerPlugin`
`19`	`19`	`new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },`
`20`	`20`	`new SAS(AlgorithmType.DaggerHashimoto),`
`21`	`21`	`new SAS(AlgorithmType.Autolykos),`
`22`		`- new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = 4UL << 30 }`
	`22`	`+ new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) }`
`23`	`23`	`}`
`24`	`24`	`},`
`25`	`25`	`{`
`@@ -30,7 +30,7 @@ public partial class NanoMinerPlugin`
`30`	`30`	`new SAS(AlgorithmType.Octopus),`
`31`	`31`	`new SAS(AlgorithmType.DaggerHashimoto),`
`32`	`32`	`new SAS(AlgorithmType.Autolykos),`
`33`		`- new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = 4UL << 30 }`
	`33`	`+ new SAS(AlgorithmType.EtcHash) {NonDefaultRAMLimit = (4UL << 29) + (5UL << 28) + (1UL << 26) }`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`},`