Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2018-01-25 UPSTREAM: harmonize conflicts to merge 2.2.4
Merge upstream updates up to Jan 10, 2018 - version 2.2.4; commit 1b4512e Merge: d2b6e6c a847808 Author: nimbosa <darth.Serious@gmail.com> Date: Thu Jan 25 11:35:27 2018 +0800 Merge branch 'windows' of TPruvot/ccminer; commit a847808 Merge: 2b081c0 50781f0 Author: nimbosa <darth.Serious@gmail.com> Date: Thu Jan 25 11:08:34 2018 +0800 # Conflicts: # Algo256/cuda_blake256.cu # Algo256/cuda_cubehash256.cu # ccminer.cpp # lyra2/cuda_lyra2.cu # lyra2/cuda_lyra2Z.cu # lyra2/lyra2REv2.cu 2017-11-01 MOD: added newer nvcc ARCH 61, fixed missing ("). commit d2b6e6c Author: nimbosa <darth.Serious@gmail.com> Date: Thu Jan 25 09:34:19 2018 +0800 Lyra2: Translate japanese comments into english (tpruvot#40); commit 50781f0 Author: hakemimi <34901335+hakemimi@users.noreply.github.com> Date: Wed Jan 10 20:24:50 2018 +0900 * Revert "lyra2: fix compilation on japanese windows (tpruvot#38)" This reverts commit 30db7d2. * Restore comments removed in tpruvot#38, translate them into English The original line says "allocate XXXX bytes to adjust for X Warp." Remove the number from comment since they are trivial * Translate Japanese comments commit 30db7d2 Author: Guillaume George <lysandergc@gmail.com> Date: Wed Jan 10 02:32:12 2018 +0900 lyra2: fix compilation on japanese windows (tpruvot#38) Remove comment that prevent compilation on japanese windows (tpruvot#38) commit 3761774 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Jan 8 13:50:20 2018 +0100 cuda: get ride of cuda 9 mask warnings commit f1a7de4 Author: Chris Spillane <chris.spillane@tuta.io> Date: Fri Jan 5 10:56:54 2018 +0000 Update README.txt (tpruvot#37) remove duplicate x17 line, add a few more coin examples. commit b54be47 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Jan 4 17:51:49 2018 +0100 upgrade BIGNUM class for openssl 1.1 commit 69e1296 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Jan 4 16:06:01 2018 +0100 update README for 2.2.4 commit 73dd6aa Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Jan 4 15:46:39 2018 +0100 keccak: avoid to use twice cuda_default_throughput and drop useless gpu hash alloc... commit 11a512f Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Sat Aug 5 04:16:28 2017 +0200 change defaults to handle cuda 9+, disable heavy and SM 2.x Heavy is the only algo using thrust which is generally broken on new cuda releases mjollnir dropped too... never seen this coin anyway... commit 91af8ab Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Jan 4 15:19:20 2018 +0100 decred doesnt allow pow votes commit 6165562 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Fri Dec 15 01:53:23 2017 +0100 equihash: fix for cuda 9.1 build commit 72466ee Author: dementeb <dementeb@users.noreply.github.com> Date: Thu Jan 4 16:56:25 2018 +0300 api: update websocket sample (tpruvot#31) commit b70409a Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Dec 14 18:12:01 2017 +0100 lyra2RE: link the merged blake/keccak kernel into algos old keccak256_gpu_hash_32 kernel commented to reduce binary size compat. not yet tested on old cards commit 18d2991 Author: Myrinia <patrick.braunstorfer@gmail.com> Date: Thu Dec 14 16:19:45 2017 +0100 Improve Lyra2RE2 Performance Improved Lyra2Re2 Performance by 1 % commit 6c0e656 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Sat Dec 9 16:54:35 2017 +0100 keccak: fix issue with intensity commit 015d129 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Dec 4 21:47:31 2017 +0100 keccak second nonce, and higher intensity commit cf886b5 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Dec 4 15:58:07 2017 +0100 import and adapt alexis optimised keccak256 for SM 5+ and increase default intensity for these recent cards commit d19e2a1 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Sun Dec 3 16:49:23 2017 +0100 Add keccakc for creative coin Same hash as keccak, just different pool settings (sha256d and diff factor 256) commit df4fcbe Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Nov 20 08:50:32 2017 +0100 jha: remove deprecated warning commit bfa616a Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Nov 20 07:47:11 2017 +0100 linux: common openssl lib function for 1.1+ commit dfff3b3 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Nov 20 07:30:04 2017 +0100 windows: high precision timer before threads start commit 2e0a977 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Nov 16 09:21:38 2017 +0100 polytimos algo (6 chained algos with streebog) commit 2b081c0 Merge: 8affcb9 6c7fa7c Author: nimbosa <darth.Serious@gmail.com> Date: Wed Nov 1 19:35:34 2017 +0800 2017-10-10--UPSTREAM: merge changes as of Oct 10, 2017 commit 6c7fa7c Merge: e1575c5 8affcb9 Author: nimbosa <darth.Serious@gmail.com> Date: Wed Nov 1 19:32:42 2017 +0800 2017-10-10--UPSTREAM: merge changes as of Oct 10, 2017 commit e1575c5 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Oct 9 19:49:05 2017 +0200 update README for v2.2.2 commit ed27598 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Oct 9 19:15:46 2017 +0200 import and clean hsr algo commit cf18cb6 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Oct 9 14:39:00 2017 +0200 equihash: missing free on benchs commit e505d10 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Oct 9 14:00:15 2017 +0200 new --submit-stale parameter (tpruvot#24) commit 5a90db1 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Mon Oct 9 13:26:29 2017 +0200 phi: maxwell opt (aes final + streebog) + fix the fugue leak.. Also update sib algo with this improvement commit 3dbcc5d Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Sat Oct 7 10:34:27 2017 +0200 Import phi algo (by anorganix) only made a few changes to keep algos in the alpha order commit 575aa1a Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Thu Oct 5 13:17:31 2017 +0200 ccminer: argument fix for 10th device selection commit 4d09d85 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Wed Sep 20 05:08:23 2017 +0200 readme: move ubuntu stuff in INSTALL file, no ads commit e3e8481 Author: cedric walter <cedric.walter@gmail.com> Date: Tue Sep 19 09:41:58 2017 +0200 readme: add howto for ubuntu (tpruvot#23) tested on 17.10 commit ebf055d Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Fri Sep 1 20:33:50 2017 +0200 update c11 like tribus + 2.2.1 readme commit d47dd9d Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Fri Sep 1 17:03:09 2017 +0200 tribus: optimised version for recent cards main improvement is on echo, based on alexis sib kernel work tested on SM 3.0 and more recent commit 949061d Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Sun Aug 27 19:17:42 2017 +0200 xmr: disable huge pages if not defined tpruvot#19 commit 8affcb9 Author: Nanashi-Meiyo-Meijin <31034492+Nanashi-Meiyo-Meijin@users.noreply.github.com> Date: Fri Aug 18 11:43:32 2017 +0900 v2.2-mod-r2 release commit 1e71dc5 Author: Tanguy Pruvot <tanguy.pruvot@gmail.com> Date: Wed Aug 16 13:42:21 2017 +0200 streebog: apply skunk improvements to veltor
- Loading branch information