diff options
Diffstat (limited to 'command/build_clib.py')
| -rw-r--r-- | command/build_clib.py | 178 |
1 files changed, 112 insertions, 66 deletions
diff --git a/command/build_clib.py b/command/build_clib.py index 2aff51e08..02e88a204 100644 --- a/command/build_clib.py +++ b/command/build_clib.py @@ -1,19 +1,15 @@ """ Modified version of build_clib that handles fortran source files. """ +import os from distutils.command.build_clib import build_clib as old_build_clib -from distutils.errors import DistutilsSetupError +from distutils.errors import DistutilsSetupError, DistutilsError from numpy.distutils import log from distutils.dep_util import newer_group from numpy.distutils.misc_util import filter_sources, has_f_sources,\ has_cxx_sources, all_strings, get_lib_source_files, is_sequence -try: - set -except NameError: - from sets import Set as set - # Fix Python distutils bug sf #1718574: _l = old_build_clib.user_options for _i in range(len(_l)): @@ -33,45 +29,31 @@ class build_clib(old_build_clib): def initialize_options(self): old_build_clib.initialize_options(self) self.fcompiler = None - - def finalize_options(self): - old_build_clib.finalize_options(self) - self._languages = None - self.set_undefined_options('config_fc', - ('fcompiler', 'fcompiler')) - # we set this to the appropiate Fortran compiler object - # (f77 or f90) in the .run() method - self._fcompiler = None - - def languages(self): - """Return a set of language names used in this library. - Valid language names are 'c', 'f77', and 'f90'. - """ - if self._languages is None: - languages = set() - for (lib_name, build_info) in self.libraries: - l = build_info.get('language',None) - if l: - languages.add(l) - self._languages = languages - return self._languages + return def have_f_sources(self): - l = self.languages() - return 'f90' in l or 'f77' in l + for (lib_name, build_info) in self.libraries: + if has_f_sources(build_info.get('sources',[])): + return True + return False def have_cxx_sources(self): - l = self.languages() - return 'c++' in l + for (lib_name, build_info) in self.libraries: + if has_cxx_sources(build_info.get('sources',[])): + return True + return False def run(self): if not self.libraries: return # Make sure that library sources are complete. - self.run_command('build_src') - - languages = self.languages() + languages = [] + for (lib_name, build_info) in self.libraries: + if not all_strings(build_info.get('sources',[])): + self.run_command('build_src') + l = build_info.get('language',None) + if l and l not in languages: languages.append(l) from distutils.ccompiler import new_compiler self.compiler = new_compiler(compiler=self.compiler, @@ -88,17 +70,20 @@ class build_clib(old_build_clib): self.compiler.show_customization() if self.have_f_sources(): - if 'f90' in languages: - fc = self.fcompiler.f90() - else: - fc = self.fcompiler.f77() + from numpy.distutils.fcompiler import new_fcompiler + self.fcompiler = new_fcompiler(compiler=self.fcompiler, + verbose=self.verbose, + dry_run=self.dry_run, + force=self.force, + requiref90='f90' in languages) + self.fcompiler.customize(self.distribution) + libraries = self.libraries self.libraries = None - fc.customize_cmd(self) + self.fcompiler.customize_cmd(self) self.libraries = libraries - fc.show_customization() - self._fcompiler = fc + self.fcompiler.show_customization() self.build_libraries(self.libraries) @@ -110,10 +95,10 @@ class build_clib(old_build_clib): return filenames def build_libraries(self, libraries): - fcompiler = self._fcompiler - compiler = self.compiler - for (lib_name, build_info) in libraries: + # default compilers + compiler = self.compiler + fcompiler = self.fcompiler sources = build_info.get('sources') if sources is None or not is_sequence(sources): @@ -123,9 +108,21 @@ class build_clib(old_build_clib): "a list of source filenames") % lib_name sources = list(sources) + c_sources, cxx_sources, f_sources, fmodule_sources \ + = filter_sources(sources) + requiref90 = not not fmodule_sources or \ + build_info.get('language','c')=='f90' + + # save source type information so that build_ext can use it. + source_languages = [] + if c_sources: source_languages.append('c') + if cxx_sources: source_languages.append('c++') + if requiref90: source_languages.append('f90') + elif f_sources: source_languages.append('f77') + build_info['source_languages'] = source_languages + lib_file = compiler.library_filename(lib_name, output_dir=self.build_clib) - depends = sources + build_info.get('depends',[]) if not (self.force or newer_group(depends, lib_file, 'newer')): log.debug("skipping '%s' library (up-to-date)", lib_name) @@ -133,34 +130,42 @@ class build_clib(old_build_clib): else: log.info("building '%s' library", lib_name) - config_fc = build_info.get('config_fc',{}) if fcompiler is not None and config_fc: log.info('using additional config_fc from setup script '\ 'for fortran compiler: %s' \ % (config_fc,)) + from numpy.distutils.fcompiler import new_fcompiler + fcompiler = new_fcompiler(compiler=fcompiler.compiler_type, + verbose=self.verbose, + dry_run=self.dry_run, + force=self.force, + requiref90=requiref90) dist = self.distribution base_config_fc = dist.get_option_dict('config_fc').copy() base_config_fc.update(config_fc) fcompiler.customize(base_config_fc) + # check availability of Fortran compilers + if (f_sources or fmodule_sources) and fcompiler is None: + raise DistutilsError, "library %s has Fortran sources"\ + " but no Fortran compiler found" % (lib_name) + macros = build_info.get('macros') include_dirs = build_info.get('include_dirs') extra_postargs = build_info.get('extra_compiler_args') or [] - c_sources, cxx_sources, f_sources, fmodule_sources \ - = filter_sources(sources) + # where compiled F90 module files are: + module_dirs = build_info.get('module_dirs') or [] + module_build_dir = os.path.dirname(lib_file) + if requiref90: self.mkpath(module_build_dir) - if self.compiler.compiler_type=='msvc': + if compiler.compiler_type=='msvc': # this hack works around the msvc compiler attributes # problem, msvc uses its own convention :( c_sources += cxx_sources cxx_sources = [] - if fmodule_sources: - print 'XXX: Fortran 90 module support not implemented or tested' - f_sources.extend(fmodule_sources) - objects = [] if c_sources: log.info("compiling C sources") @@ -182,20 +187,61 @@ class build_clib(old_build_clib): extra_postargs=extra_postargs) objects.extend(cxx_objects) - if f_sources: - log.info("compiling Fortran sources") - f_objects = fcompiler.compile(f_sources, - output_dir=self.build_temp, - macros=macros, - include_dirs=include_dirs, - debug=self.debug, - extra_postargs=[]) - objects.extend(f_objects) + if f_sources or fmodule_sources: + extra_postargs = [] + f_objects = [] + + if requiref90: + if fcompiler.module_dir_switch is None: + existing_modules = glob('*.mod') + extra_postargs += fcompiler.module_options(\ + module_dirs,module_build_dir) + + if fmodule_sources: + log.info("compiling Fortran 90 module sources") + f_objects += fcompiler.compile(fmodule_sources, + output_dir=self.build_temp, + macros=macros, + include_dirs=include_dirs, + debug=self.debug, + extra_postargs=extra_postargs) + + if requiref90 and self.fcompiler.module_dir_switch is None: + # move new compiled F90 module files to module_build_dir + for f in glob('*.mod'): + if f in existing_modules: + continue + t = os.path.join(module_build_dir, f) + if os.path.abspath(f)==os.path.abspath(t): + continue + if os.path.isfile(t): + os.remove(t) + try: + self.move_file(f, module_build_dir) + except DistutilsFileError: + log.warn('failed to move %r to %r' \ + % (f, module_build_dir)) + + if f_sources: + log.info("compiling Fortran sources") + f_objects += fcompiler.compile(f_sources, + output_dir=self.build_temp, + macros=macros, + include_dirs=include_dirs, + debug=self.debug, + extra_postargs=extra_postargs) + else: + f_objects = [] + + objects.extend(f_objects) - self.compiler.create_static_lib(objects, lib_name, - output_dir=self.build_clib, - debug=self.debug) + # assume that default linker is suitable for + # linking Fortran object files + compiler.create_static_lib(objects, lib_name, + output_dir=self.build_clib, + debug=self.debug) + # fix library dependencies clib_libraries = build_info.get('libraries',[]) for lname, binfo in libraries: if lname in clib_libraries: |