Attachment #76115 for bug #117676

View | Details | Raw Unified | Return to bug 117676
Collapse All | Expand All

Lines 174-179 Link Here

(-)scipy_distutils/gnufcompiler.py (-1 / +4 lines)
174	opt.append('-march=opteron')	174	opt.append('-march=opteron')
175	elif cpu.is_Athlon64():	175	elif cpu.is_Athlon64():
176	opt.append('-march=athlon64')	176	opt.append('-march=athlon64')
		177	elif cpu.is_Nocona():
		178	opt.append('-march=nocona')
177	else:	179	else:
178	march_flag = 0	180	march_flag = 0
179	if cpu.has_mmx(): opt.append('-mmmx')	181	if cpu.has_mmx(): opt.append('-mmmx')
Lines 196-202 Link Here
196	elif cpu.is_i386():	198	elif cpu.is_i386():
197	opt.append('-march=i386')	199	opt.append('-march=i386')
198	if cpu.is_Intel():	200	if cpu.is_Intel():
199	opt.extend(['-malign-double','-fomit-frame-pointer'])	201	if not cpu.is_64bit():
		202	opt.extend(['-malign-double','-fomit-frame-pointer'])
200	return opt	203	return opt
201		204
202	if __name__ == '__main__':	205	if __name__ == '__main__':




    def _is_Itanium(self):
        return re.match(r'.*?Itanium\b',
                        self.info[0]['model name']) is not None

    def _is_XEON(self):
        return re.match(r'.*?XEON\b',
                        self.info[0]['model name']) is not None 
    def _is_Nocona(self):
        return self.info[0]['cpu family']=='15' and self.info[0]['model']=='4'
	
    # Varia

    def _is_singleCPU(self):

Return to bug 117676

Lines 180-191 Link Here

(-)scipy_distutils/cpuinfo.py (-4 / +4 lines)
180	def _is_Itanium(self):	180	def _is_Itanium(self):
181	return re.match(r'.*?Itanium\b',	181	return re.match(r'.*?Itanium\b',
182	self.info[0]['model name']) is not None	182	self.info[0]['model name']) is not None
183
184	def _is_XEON(self):	183	def _is_XEON(self):
185	return re.match(r'.*?XEON\b',	184	return re.match(r'.*?XEON\b',
186	self.info[0]['model name']) is not None	185	self.info[0]['model name']) is not None
187		186	def _is_Nocona(self):
188		187	return self.info[0]['cpu family']=='15' and self.info[0]['model']=='4'
		188
189	# Varia	189	# Varia
190		190
191	def _is_singleCPU(self):	191	def _is_singleCPU(self):