Merge branch 'release-4-6'

[alexxy/gromacs.git] / src / gromacs / legacyheaders / gmx_cpuid.h

diff --git a/src/gromacs/legacyheaders/gmx_cpuid.h b/src/gromacs/legacyheaders/gmx_cpuid.h
index e317d9ee6e1f04bd1721179f6b62aee9ee758592..fdbf854dc4a697cab9a7be52d59bbfdd73abbfc2 100644 (file)
--- a/src/gromacs/legacyheaders/gmx_cpuid.h
+++ b/src/gromacs/legacyheaders/gmx_cpuid.h
@@ -39,6 +39,8 @@ enum gmx_cpuid_vendor
     GMX_CPUID_VENDOR_UNKNOWN,
     GMX_CPUID_VENDOR_INTEL,
     GMX_CPUID_VENDOR_AMD,
+    GMX_CPUID_VENDOR_FUJITSU,
+    GMX_CPUID_VENDOR_IBM,
     GMX_CPUID_NVENDORS
 };
 
@@ -112,6 +114,7 @@ enum gmx_cpuid_acceleration
     GMX_CPUID_ACCELERATION_X86_SSE4_1,
     GMX_CPUID_ACCELERATION_X86_AVX_128_FMA,
     GMX_CPUID_ACCELERATION_X86_AVX_256,
+    GMX_CPUID_ACCELERATION_SPARC64_HPC_ACE,
     GMX_CPUID_NACCELERATIONS
 };