Merge pull request #410 from gkanwar/photon_and_sha_patches

Photon.h and SHA256 patches
Remove FP16 tests when FP16 is disabled
2025-06-22 09:42:02 +01:00 · 2022-08-31 18:01:45 -04:00 · 2022-08-21 17:29:55 +02:00 · 2022-08-21 17:28:57 +02:00 · 2022-08-21 16:16:18 +02:00
3 changed files with 6 additions and 5 deletions
--- a/Grid/qcd/action/gauge/Photon.h
+++ b/Grid/qcd/action/gauge/Photon.h
@ -49,7 +49,7 @@ NAMESPACE_BEGIN(Grid);
    
    typedef Lattice<SiteLink>  LinkField;
    typedef Lattice<SiteField> Field;
-    typedef Field              ComplexField;
+    typedef LinkField          ComplexField;
  };
  
  typedef QedGImpl<vComplex> QedGImplR;
--- a/Grid/util/Sha.h
+++ b/Grid/util/Sha.h
@ -27,6 +27,7 @@
    /*  END LEGAL */
 extern "C" {
 #include <openssl/sha.h>
+#include <openssl/evp.h>
 }
 #ifdef USE_IPP
 #include "ipp.h"
@ -70,10 +71,8 @@ public:
  static inline std::vector<unsigned char> sha256(const void *data,size_t bytes)
  {
    std::vector<unsigned char> hash(SHA256_DIGEST_LENGTH);
-    SHA256_CTX sha256;
-    SHA256_Init  (&sha256);
-    SHA256_Update(&sha256, data,bytes);
-    SHA256_Final (&hash[0], &sha256);
+    auto digest = EVP_get_digestbyname("SHA256");
+    EVP_Digest(data, bytes, &hash[0], NULL, digest, NULL);
    return hash;
  }
  static inline std::vector<int> sha256_seeds(const std::string &s)
--- a/tests/Test_simd.cc
+++ b/tests/Test_simd.cc
@ -793,6 +793,7 @@ int main (int argc, char ** argv)
    }
    std::cout <<" OK ! "<<std::endl;

+#ifdef USE_FP16
    // Double to Half
    std::cout << GridLogMessage<< "Double to half" ;
    precisionChange(&H[0],&D[0],Ndp);
@ -822,6 +823,7 @@ int main (int argc, char ** argv)
      assert( tmp < 1.0e-3 );
    }
    std::cout <<" OK ! "<<std::endl;
+#endif

  }
  Grid_finalize();
Author	SHA1	Message	Date
Peter Boyle	913fbca74a	Merge pull request #410 from gkanwar/photon_and_sha_patches Photon.h and SHA256 patches	2022-08-31 18:01:45 -04:00
Gurtej Kanwar	60dfb49afa	Remove FP16 tests when FP16 is disabled	2022-08-21 17:29:55 +02:00
Gurtej Kanwar	554c238359	Update OpenSSL digest to use high-level methods This avoids deprecation warnings when compiling against OpenSSL 3.0 but should still be backwards compatible. It is the recommended way to use the digest API going forward.	2022-08-21 17:28:57 +02:00
Gurtej Kanwar	f922adf05e	Fix Photon ComplexField type	2022-08-21 16:16:18 +02:00