Major rework for OpenCL/BLAS support. Threading fixes.

Author: gcp

Diff for: AboutDialog.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "AboutDialog.h"
 #include "config.h"
+#include "Network.h"
 
 AboutDialog::AboutDialog( wxWindow* parent )
 :
@@ -10,9 +11,7 @@ TAboutDialog( parent )
 }
 
 void AboutDialog::doInit( wxInitDialogEvent& event ) {
-#ifdef LITEVERSION
-    m_staticTextVersion->SetLabel(wxString(_("Leela lite version ")) + wxString(wxT(VERSION)));    
-#else
-    m_staticTextVersion->SetLabel(wxString(_("Leela version ")) + wxString(wxT(VERSION)));    
-#endif
+    m_staticTextVersion->SetLabel(wxString(_("Leela version ")) + wxString(wxT(PROGRAM_VERSION)));    
+    m_staticTextEngine->SetLabel(wxString(Network::get_Network()->get_backend()));
+    Fit();
 }

Diff for: App.cpp

@@ -1,221 +1,18 @@
 #include "stdafx.h"
 #include "App.h"
 #include "MainFrame.h"
-#include "CopyProtectionDialog.h"
-#include "keygen/sha2.h"
 
 IMPLEMENT_APP(MyApp);
 
-#ifdef COPYPROTECT
-#ifndef LITEVERSION
-// public key
-extern unsigned int pub[16384];
-
-static void sha256_rounds(unsigned char *s, unsigned char *d, unsigned int r) {    
-    int j;
-    
-    for (j = 0; j < 8192; j++) {                
-        s[28] ^= (r & 0xFF00) >> 8;
-        s[29] ^=  r &   0xFF;
-        s[30] ^= (j & 0xFF00) >> 8;            
-        s[31] ^=  j &   0xFF;               
-        sha256((unsigned char*)s,   32, (unsigned char*)d);
-        d[28] ^= (r & 0xFF00) >> 8;
-        d[29] ^=  r &   0xFF;
-        d[30] ^= (j & 0xFF00) >> 8;            
-        d[31] ^=  j &   0xFF;                          
-        sha256((unsigned char*)d,   32, (unsigned char*)s);            
-    }        
-    
-    memcpy(d, s, 32);
-}
-
-static void sha256_16k(char *in, unsigned char *out, unsigned int r) {
-    unsigned char s[32];
-    unsigned char d[32];    
-    
-    sha256((unsigned char*)in, strlen(in), s);    
-    
-    sha256_rounds((unsigned char*)s, (unsigned char*)d, r);
-    
-    memcpy(out, d, 32);
-}
-
-bool Verify_Serial(wxString p_regname, wxString p_serial) {                    
-    char regbuff[256];
-    char bregname[256], bserial[256];
-    char *regname = bregname;
-    char *serial = bserial;
-    unsigned int check1, check2, seal1, seal2;        
-        
-    memset(regbuff, 0, sizeof(regbuff));
-    memset(bregname, 0, sizeof(bregname));
-    memset(bserial, 0, sizeof(bserial));
-    
-    strncpy(regname, p_regname.c_str(), 256);
-    strncpy(serial, p_serial.c_str(), 256);
-            
-    char *s = regname;
-    int len = strlen(s);
-    
-    if (len > 255) {
-        return false;
-    }
-    
-    if (strlen(serial) > 255) {
-        return false;
-    }
-    
-    /*
-        strip starting whitespace
-    */                                   
-    while(*s == ' ') {
-        s++;
-        len--;
-    }         
-    
-    strncpy(regbuff, s, len);
-    
-    /*
-        axe trailing spaces, newlines
-    */
-    int len2 = strlen(regbuff);
-    int pos = len2 - 1;
-    
-    while ((regbuff[pos] == ' ' || regbuff[pos] == 13 || regbuff[pos] == 11) && pos > 0) {
-        regbuff[pos] = 0;
-        pos--;
-    }
-    
-    int len3 = strlen(regbuff);
-    int j;        
-    
-    for (j = 0; j < len3; j++) {
-        if (regbuff[j] > 126 || regbuff[j] < 32) {
-            regbuff[j] = '_';
-        }
-        regbuff[j] = toupper(regbuff[j]);
-    }             
-    
-    unsigned char dg[32];
-    
-    sha256_16k(regbuff, dg, 0);
-    
-    unsigned int idx1 = ((dg[30] << 8) | dg[31]) & 0x3FFF;
-    unsigned int idx2 = ((dg[28] << 8) | dg[29]) & 0x3FFF;
-    
-    check1 = pub[idx1];
-    check2 = pub[idx2];
-    
-    char keychars[32] = { '1', '3', '4', '5', '6', '7', '8', '9',
-                          'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 
-                          'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 
-                          'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};    
-        
-    unsigned int dcount = 0;
-    seal1 = 0;
-    seal2 = 0;
-    
-    while (*serial != 0 && dcount < 7) {
-        for (j = 0; j < 32; j++) {
-            if (toupper(*serial) == keychars[j]) {
-                dcount++;
-                seal1 <<= 5;
-                seal1 |= j; 
-            }
-        }                            
-        serial++;
-    }
-    
-    dcount = 0;
-    
-    while (*serial != 0 && dcount < 7) {
-        for (j = 0; j < 32; j++) {
-            if (toupper(*serial) == keychars[j]) {
-                dcount++;
-                seal2 <<= 5;
-                seal2 |= j; 
-            }
-        }                            
-        serial++;
-    }
-            
-    unsigned char sr[32];
-    unsigned char or[32];
-    
-    memset(sr, 0, 32);
-    sr[28] = (seal1 >> 24) & 0xFF;
-    sr[29] = (seal1 >> 16) & 0xFF;
-    sr[30] = (seal1 >>  8) & 0xFF;
-    sr[31] = (seal1 >>  0) & 0xFF;
-    
-    sha256_rounds(sr, or, idx1);
-
-    seal1 = (or[28] << 24)
-           | (or[29] << 16)
-           | (or[30] <<  8)
-           | (or[31]      );
-           
-    if (check1 != seal1) {
-        return false;
-    }           
-           
-    memset(sr, 0, 32);
-    sr[28] = (seal2 >> 24) & 0xFF;
-    sr[29] = (seal2 >> 16) & 0xFF;
-    sr[30] = (seal2 >>  8) & 0xFF;
-    sr[31] = (seal2 >>  0) & 0xFF;
-    
-    sha256_rounds(sr, or, idx2);
-
-    seal2 = (or[28] << 24)
-           | (or[29] << 16)
-           | (or[30] <<  8)
-           | (or[31]      );           
-    
-    if (check1 != seal1 || check2 != seal2) {
-        return false;
-    }                    
-        
-    return true;             
-}
-#endif
-#endif
-
 bool MyApp::OnInit()
-{   
-    wxConfig * config = new wxConfig(wxT("Leela"), wxT("Sjeng.Org"));    
+{
+    wxConfig * config = new wxConfig(wxT("Leela"), wxT("Sjeng.Org"));
     wxConfig::Set(config);
 
-#ifdef COPYPROTECT
-#ifndef LITEVERSION    
-    wxString name = config->Read(wxT("Name"));
-    wxString code = config->Read(wxT("Code"));        
-    
-    while (!Verify_Serial(name, code)) {        
-        CopyProtectionDialog dialog(NULL);                
-        if (dialog.ShowModal() == wxID_OK) {
-            name = dialog.getName();
-            code = dialog.getCode();
-            config->Write(wxT("Name"), name);
-            config->Write(wxT("Code"), code);
-            if (!Verify_Serial(name, code)) {
-                ::wxMessageBox(_("The registration info you entered is not correct.\nPlease enter the name and code you received\nwhen you bought the program."),
-                               _("Copyprotection check"));
-            }
-        } else {        
-            return false;
-        }                
-    }    
-#endif
-#endif
-#ifdef LITEVERSION
-    MainFrame* frame = new MainFrame(NULL, _("Leela lite"));    
-#else
-    MainFrame* frame = new MainFrame(NULL, _("Leela"));    
-#endif
+    MainFrame* frame = new MainFrame(NULL, _("Leela"));
+
     frame->Show();
-    
+
     SetTopWindow(frame);
 
     return true;

Diff for: ClockAdjustDialog.cpp

@@ -17,11 +17,11 @@ void ClockAdjustDialog::doCancel( wxCommandEvent& event ) {
 void ClockAdjustDialog::doOK( wxCommandEvent& event ) {
     int tleftmins = m_spinCtrlBlackMins->GetValue();
     int tleftsecs = m_spinCtrlBlackSecs->GetValue();
-    m_tc.adjust_time(FastBoard::BLACK, (tleftmins * 60 + tleftsecs) * 100, 25);
+    m_tc.adjust_time(FastBoard::BLACK, (tleftmins * 60 + tleftsecs) * 100, 0);
 
     tleftmins = m_spinCtrlWhiteMins->GetValue();
     tleftsecs = m_spinCtrlWhiteSecs->GetValue();
-    m_tc.adjust_time(FastBoard::WHITE, (tleftmins * 60 + tleftsecs) * 100, 25);
+    m_tc.adjust_time(FastBoard::WHITE, (tleftmins * 60 + tleftsecs) * 100, 0);
     event.Skip();
 }
 

Diff for: EngineThread.cpp

@@ -4,60 +4,61 @@
 #include "UCTSearch.h"
 #include "MainFrame.h"
 
-TEngineThread::TEngineThread(GameState * state, wxSemaphore * sema, MainFrame * frame) {
+TEngineThread::TEngineThread(GameState * state, MainFrame * frame)
+    : wxThread(wxTHREAD_JOINABLE)
+ {
     m_state = state;
-    m_sema = sema;
     m_frame = frame;
     m_maxvisits = 0;
-    m_runflag = true; 
-    m_nopass = false;  
+    m_runflag = true;
+    m_nopass = false;
     m_quiet = false;
+    m_nets = true;
 }
 
-void * TEngineThread::Entry() {     
+void * TEngineThread::Entry() {
     {
-        m_frame->SetStatusBar(_("Engine thinking..."), 1);
-        
         std::auto_ptr<UCTSearch> search(new UCTSearch(*m_state));
-                
+
         int who = m_state->get_to_move();
         search->set_visit_limit(m_maxvisits);
         search->set_runflag(&m_runflag);
-        search->set_analyzing(m_analyseflag);  
+        search->set_analyzing(m_analyseflag);
         search->set_quiet(m_quiet);
-        
+        search->set_use_nets(m_nets);
+
         int mode = UCTSearch::NORMAL;
         if (m_nopass) {
             mode = UCTSearch::NOPASS;
         }
-        
+
         int move;
         if (m_resigning) {
             move = search->think(who, mode);
         } else {
             move = search->think(who, mode | UCTSearch::NORESIGN);
-        }        
-        
-        if (!m_analyseflag) {
-            m_state->play_move(who, move);                                
         }
-        
-        m_sema->Post();
 
-        //if (!m_analyseflag) {
-	    wxCommandEvent event(EVT_NEW_MOVE);                               
-	    ::wxPostEvent(m_frame->GetEventHandler(), event);                        
-        //}
+        if (!m_analyseflag) {
+            m_state->play_move(who, move);
+        }
     }
 
     return NULL;
 }
 
+void TEngineThread::OnExit() {
+    if (!m_analyseflag) {
+        wxQueueEvent(m_frame->GetEventHandler(),
+                     new wxCommandEvent(EVT_NEW_MOVE));
+    }
+}
+
 void TEngineThread::limit_visits(int visits) {
     m_maxvisits = visits;
 }
 
-void TEngineThread::stop_engine() {    
+void TEngineThread::stop_engine() {
     m_runflag = false;
 }
 
@@ -75,4 +76,8 @@ void TEngineThread::set_nopass(bool flag) {
 
 void TEngineThread::set_quiet(bool flag) {
     m_quiet = flag;
+}
+
+void TEngineThread::set_nets(bool flag) {
+    m_nets = flag;
 }

Diff for: EngineThread.h

@@ -3,29 +3,32 @@
 
 #include "stdafx.h"
 #include "GameState.h"
+#include <boost/atomic.hpp>
 
 class MainFrame;
 
 class TEngineThread : public wxThread {
     public:
-        TEngineThread(GameState * gamestate, wxSemaphore * sema, MainFrame * frame);
+        TEngineThread(GameState * gamestate, MainFrame * frame);
         void limit_visits(int visits);
         void set_resigning(bool res);
         void set_analyzing(bool flag);
         void set_nopass(bool flag);
         void set_quiet(bool flag);
+        void set_nets(bool flag);
         void stop_engine(void);
-        virtual void * Entry();
+        virtual void * Entry() override;
+        virtual void OnExit() override;
     private:
-        GameState * m_state; 
-        wxSemaphore * m_sema;
-        MainFrame * m_frame;                 
-        int m_maxvisits;  
-        bool m_resigning;  
-        bool m_analyseflag;  	
+        GameState * m_state;
+        MainFrame * m_frame;
+        int m_maxvisits;
+        bool m_nets;
+        bool m_resigning;
+        bool m_analyseflag;
         bool m_quiet;
         bool m_nopass;
-        bool m_runflag;    
+        boost::atomic<bool> m_runflag;
 };
 
 #endif