View | Details | Raw Unified
Collapse All | Expand All

(-) numpy/distutils/cpuinfo.py (-2 / +5 lines)
 Lines 95-101    Link Here 
        if ok:
        if ok:
            info[0]['uname_m'] = output.strip()
            info[0]['uname_m'] = output.strip()
        try:
        try:
            fo = open('/proc/cpuinfo')
#            fo = open('/proc/cpuinfo')
             fo = open('/tmp/cpuinfo')
        except EnvironmentError, e:
        except EnvironmentError, e:
            warnings.warn(str(e), UserWarning)
            warnings.warn(str(e), UserWarning)
        else:
        else:
 Lines 222-228    Link Here 
        return self.is_PentiumIV() and self.has_sse3()
        return self.is_PentiumIV() and self.has_sse3()
    def _is_Nocona(self):
    def _is_Nocona(self):
        return self.is_64bit() and self.is_PentiumIV()
        return self.is_64bit() and ( self.is_PentiumIV() \
            or re.match(r'.*?Genuine Intel\(R\) CPU.*?\b',
                self.info[0]['model name']) is not None )
    def _is_Core2(self):
    def _is_Core2(self):
        return self.is_64bit() and self.is_Intel() and \
        return self.is_64bit() and self.is_Intel() and \