[pypy-svn] rev 1416 - pypy/trunk/doc/funding

tismer at codespeak.net tismer at codespeak.net
Thu Sep 25 11:27:16 CEST 2003


Author: tismer
Date: Thu Sep 25 11:27:15 2003
New Revision: 1416

Added:
   pypy/trunk/doc/funding/B6.7.wp10_management.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp10_management.txt
   pypy/trunk/doc/funding/B6.7.wp20_interpreter.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp20_interpreter.txt
   pypy/trunk/doc/funding/B6.7.wp21_interpreter_completion.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp21_interpreter_completion.txt
   pypy/trunk/doc/funding/B6.7.wp22_cpython_to_python.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp22_cpython_to_python.txt
   pypy/trunk/doc/funding/B6.7.wp30_compiler.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp30_compiler.txt
   pypy/trunk/doc/funding/B6.7.wp31_translation_of_rpython.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp31_translation_of_rpython.txt
   pypy/trunk/doc/funding/B6.7.wp32_bootstrap_redesign.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp32_bootstrap_redesign.txt
   pypy/trunk/doc/funding/B6.7.wp33_bootstrap_runtime.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp33_bootstrap_runtime.txt
   pypy/trunk/doc/funding/B6.7.wp40_high_performance.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp40_high_performance.txt
   pypy/trunk/doc/funding/B6.7.wp41_integrate_stackless.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp41_integrate_stackless.txt
   pypy/trunk/doc/funding/B6.7.wp42_several_obj_impl.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp42_several_obj_impl.txt
   pypy/trunk/doc/funding/B6.7.wp43_translator_optimisations.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp43_translator_optimisations.txt
   pypy/trunk/doc/funding/B6.7.wp44_integrate_psyco.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp44_integrate_psyco.txt
   pypy/trunk/doc/funding/B6.7.wp50_validations.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp50_validations.txt
   pypy/trunk/doc/funding/B6.7.wp51_embedded_device.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp51_embedded_device.txt
   pypy/trunk/doc/funding/B6.7.wp52_small_os_pre.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp52_small_os_pre.txt
   pypy/trunk/doc/funding/B6.7.wp53_small_os.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp53_small_os.txt
   pypy/trunk/doc/funding/B6.7.wp54_simd_architecture.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp54_simd_architecture.txt
   pypy/trunk/doc/funding/B6.7.wp55_numerical_package.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp55_numerical_package.txt
   pypy/trunk/doc/funding/B6.7.wp56_load_balancing.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp56_load_balancing.txt
   pypy/trunk/doc/funding/B6.7.wp60_documentation.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp60_documentation.txt
   pypy/trunk/doc/funding/B6.7.wp70_maintenance.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp70_maintenance.txt
   pypy/trunk/doc/funding/B6.7.wp80_synchronisation.txt   (props changed)
      - copied unchanged from rev 1415, pypy/trunk/doc/funding/B6.wp80_synchronisation.txt
Removed:
   pypy/trunk/doc/funding/B6.wp10_management.txt
   pypy/trunk/doc/funding/B6.wp20_interpreter.txt
   pypy/trunk/doc/funding/B6.wp21_interpreter_completion.txt
   pypy/trunk/doc/funding/B6.wp22_cpython_to_python.txt
   pypy/trunk/doc/funding/B6.wp30_compiler.txt
   pypy/trunk/doc/funding/B6.wp31_translation_of_rpython.txt
   pypy/trunk/doc/funding/B6.wp32_bootstrap_redesign.txt
   pypy/trunk/doc/funding/B6.wp33_bootstrap_runtime.txt
   pypy/trunk/doc/funding/B6.wp40_high_performance.txt
   pypy/trunk/doc/funding/B6.wp41_integrate_stackless.txt
   pypy/trunk/doc/funding/B6.wp42_several_obj_impl.txt
   pypy/trunk/doc/funding/B6.wp43_translator_optimisations.txt
   pypy/trunk/doc/funding/B6.wp44_integrate_psyco.txt
   pypy/trunk/doc/funding/B6.wp50_validations.txt
   pypy/trunk/doc/funding/B6.wp51_embedded_device.txt
   pypy/trunk/doc/funding/B6.wp52_small_os_pre.txt
   pypy/trunk/doc/funding/B6.wp53_small_os.txt
   pypy/trunk/doc/funding/B6.wp54_simd_architecture.txt
   pypy/trunk/doc/funding/B6.wp55_numerical_package.txt
   pypy/trunk/doc/funding/B6.wp56_load_balancing.txt
   pypy/trunk/doc/funding/B6.wp60_documentation.txt
   pypy/trunk/doc/funding/B6.wp70_maintenance.txt
   pypy/trunk/doc/funding/B6.wp80_synchronisation.txt
   pypy/trunk/doc/funding/uncrappify.py
Modified:
   pypy/trunk/doc/funding/B1.0_objectives.txt
   pypy/trunk/doc/funding/B6.1_plan_introduction.txt
   pypy/trunk/doc/funding/crossreferences.asc
   pypy/trunk/doc/funding/mkxref.py
Log:
renamed all WPs to B6.7.wp...

Modified: pypy/trunk/doc/funding/B1.0_objectives.txt
==============================================================================
--- pypy/trunk/doc/funding/B1.0_objectives.txt	(original)
+++ pypy/trunk/doc/funding/B1.0_objectives.txt	Thu Sep 25 11:27:15 2003
@@ -48,7 +48,7 @@
 impairing the flexibility.
 
 
-The flexibility goal
+The Flexibility Goal
 --------------------
 
 The flexibility problem is pernicious. It affects almost all aspects of
@@ -62,7 +62,7 @@
   interpreter globally. These aspects are usually frozen in early design
   decisions (memory management, object model, multithreading,...).
 
-* optimization drives the interpreter code base, an error-prone and
+* optimisation drives the interpreter code base, an error-prone and
   scope-limiting process. It is impossible to reuse the code base for
   implementation on new, non-C platforms; you need to start from scratch.
 
@@ -109,7 +109,7 @@
 interpreter at no effort. Such a use will be shown below.
 
 
-The performance goal, phase 1
+The Performance Goal, Phase 1
 -----------------------------
 
 Flexibility is often associated with poor performances, although
@@ -144,7 +144,7 @@
 source, but derived from it by the translator with the support of a
 small run-time system written in C. It is thus expected that the
 translator should be a highly configurable tool, with pluggable
-components, that will allow us (and third-parties) to produce customized
+components, that will allow us (and third-parties) to produce customised
 C versions of PyPy with tailored trade-offs. Moreover, the exact set of
 Python source that the translator will be applied to can be varied as
 well, producing C versions with different capabilities.
@@ -154,7 +154,7 @@
 4. to produce several different C versions for different identified usages
    of Python;
 
-5. to allow third-parties to produce customized C version easily;
+5. to allow third-parties to produce customised C version easily;
 
 6. to adapt the translator to target other non-C platforms (Java and/or
    .NET and/or other).
@@ -195,10 +195,10 @@
   levels of a hand-crafted JIT.
 
 
-The performance goal, phase 2
+The Performance Goal, Phase 2
 -----------------------------
 
-Building on phase 1, we aim to add a JIT compiler to PyPy. This will be
+Building upon phase 1, we aim to add a JIT compiler to PyPy. This will be
 done using a different technique than described in the previous
 paragraph: our goal is to *generate* the JIT compiler from the
 high-level Python source of PyPy.
@@ -213,19 +213,19 @@
 uncommon for JITs, but Psyco's good results give ample proof-of-concept.
 Moreover, this property can be explicitely related to the DynamoRIO
 project cited above, which instrumentates the interpreter itself.
-Indeed, the one-to-one correspondance between parts of C Python and
+Indeed, the one-to-one correspondence between parts of C Python and
 Psyco is as follows: to each expression in C Python corresponds a more
 complex expression in Psyco, which does instrumentation and
-optimizations. The difference with DynamoRIO is that the latter analyses
-at run-time the machine code resulting from the compilation of the
-interpreter. In Psyco the one-to-one correspondance is with the C source
+optimisations. The difference with DynamoRIO is that the latter analyses
+the machine code resulting from the compilation of the interpreter
+at run-time. In Psyco, the one-to-one correspondance is with the C source
 instead. It could certainly have been done by automated analysis of the
 C source of C Python, but this is difficult and error-prone.
 
-In the PyPy project, on the other hand, the source code of the
-interpreter will be in Python instead of C. It is much easier to analyse
+In the PyPy project, on the other hand, the source code of the interpreter
+will be written in Python instead of C. This is much easier to analyse
 safely. Thus, the plan is to raise the level further and rely on yet
-another customization of the translator, to let it emit the complex
+another customisation of the translator, to let it emit the complex
 Psyco-style expressions instead of (or in addition to) the normal C
 expressions that would be the direct translation.
 
@@ -234,7 +234,7 @@
 7. to provide a flexible Python interpreter running at JIT speed.
 
 
-The translator
+The Translator
 --------------
 
 Finally, if this were still needed, let us further demonstrate the
@@ -252,12 +252,12 @@
 to translate; all manipulated objects are abstracted into their type
 only. Operations between two such "abstract objects" return a new
 "abstract object", which represents the type of the result.] As we have
-seen above, abstract interpretation is easily acheived by plugging a
+seen above, abstract interpretation is easily achieved by plugging a
 custom object space into the PyPy code base. The translator can be built
 as an extension of this "type inference" object space, emitting
 translated code as a side-effect along the analysis. Thus the translator
 is nothing more than PyPy itself with a custom object space: when you
-use this special version of PyPy to "interpret" a Python function, it is
-in fact translated...
+use this special version of PyPy to "interpret" a Python function, it
+becomes in fact translated...
 
 In summary, to translate PyPy itself to C, we will be using PyPy!

Modified: pypy/trunk/doc/funding/B6.1_plan_introduction.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.1_plan_introduction.txt	(original)
+++ pypy/trunk/doc/funding/B6.1_plan_introduction.txt	Thu Sep 25 11:27:15 2003
@@ -328,14 +328,14 @@
 
 WP55_: Enhanced Numerical Package
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Rewrite a numerical Python package like NumPy
-using RPython. Identify the numerical operations
-in the package which are candidates for parallelization.
-Write an interface that allows to implement these operations
-in either a traditional way or using SIMD instructions,
-dependent from the available capabilities of the current
-code generator.
+  
+  Rewrite a numerical Python package like NumPy
+  using RPython. Identify the numerical operations
+  in the package which are candidates for parallelization.
+  Write an interface that allows to implement these operations
+  in either a traditional way or using SIMD instructions,
+  dependent from the available capabilities of the current
+  code generator.
 
 Load Balancing in a Multi-Processor environment
 ---------------------------------------------------

Deleted: /pypy/trunk/doc/funding/B6.wp10_management.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp10_management.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,54 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Coordination and Management
-.. |wp|    replace:: WP10
-.. |start| replace:: 0
-.. |p1|    replace:: X
-.. |m1|    replace:: 18
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Coordination and Management of the PyPy Project.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- collection and monitoring of monthly status reports,
-- reporting to the EU
-- organising meetings
-- maintaining an internal web site. The website will make heavy
-  use of collaborative tools like Wiki pages, a content management system,
-  and issue trackers.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- Collection and monitoring of reports
-- Report to EU
-- Organise meetings
-- Create and maintain internal web site
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp20_interpreter.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp20_interpreter.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,46 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: The PyPy Interpreter
-.. |wp|    replace:: WP20
-.. |start| replace:: 0
-.. |p1|    replace:: |e|
-.. |m1|    replace:: |e|
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Building a complete PyPy interpreter.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-This working package consists of the tasks WP21_ WP22_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M1
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp21_interpreter_completion.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp21_interpreter_completion.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,55 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Development and Completion of the PyPy Interpreter
-.. |wp|    replace:: WP21
-.. |start| replace:: 0
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Z
-.. |m3|    replace:: 3
-.. |p4|    replace:: T
-.. |m4|    replace:: 3
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-The PyPy interpreter itself should be developed and completed
-as a regular Python program. This package includes all
-parts of CPython that we don't want to move to WP22_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Coordinate with WP22_ which parts of CPython
-  should be implemented in RPython.
-- Implementation of all C modules and C objects
-- Further investigation of the unorthodox multimethod
-  concepts that the standard object space is based on,
-  and how to hook in the bytecode compiler.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL01: First complete Python Implementation
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M1 with WP22_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp22_cpython_to_python.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp22_cpython_to_python.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,56 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Translation of CPython into regular Python
-.. |wp|    replace:: WP22
-.. |start| replace:: 0
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Z
-.. |m3|    replace:: 3
-.. |p4|    replace:: T
-.. |m4|    replace:: 3
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Translate all parts of CPython which we don't want to
-implement in WP21_ into regular Python libraries.
-Note: These ones should also work without PyPy, being just plain-Python
-replacements for existing CPython functionality.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Coordinate with WP21_ which parts of CPython should be implemented in Python
-- Implementation of all C modules and C objects
-- Implement the Python bytecode compiler, which definately should
-  become a regular Python program, instead of being built
-  into the interpreter.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL01: First complete Python Implementation
-- DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M1 with WP21_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp30_compiler.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp30_compiler.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,46 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: The PyPy Compiler
-.. |wp|    replace:: WP30
-.. |start| replace:: 0
-.. |p1|    replace:: |e|
-.. |m1|    replace:: |e|
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Building the translator and Bootstrapping PyPy.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-This working package consists of the tasks WP31_ WP32_ WP33_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M2
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp31_translation_of_rpython.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp31_translation_of_rpython.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,72 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Translation of RPython
-.. |wp|    replace:: WP31
-.. |start| replace:: M1
-.. |p1|    replace:: X
-.. |m1|    replace:: 4
-.. |p2|    replace:: Y
-.. |m2|    replace:: 4
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Ability to translate arbitrary RPython source code (e.g. 
-  the one produced in WP21_ into low-level code (C, Pyrex, Java, others). 
-- Creation of a stand-alone, not-PyPy-related tool for general
-  optimization of arbitrary but suitably restricted Python application or
-  parts thereof.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-*Part a): Code Analysis*
-
-- Analyse code to produce the relevant typing information.
-- Investigate whether we can use the annotation object space
-  only or if additional AST-based control flow analysis is needed.
-- Give a formal definition of RPython.
-
-*Part b): Code Production*
-
-- Compare different low-level environments that
-  we could target (C, Pyrex, others?). Select at least
-  one suitable target.
-- Produce low-level code out of the data gathered in Part a).
-- Again investigate how this is best done (AST-guided translation or
-  reverse-engeneering of the low-level control flow gathered by the
-  annotation object space).
-- Provide some measure for the efficiency of the generated
-  code, in comparison to Standard Python.
-
-Note that this task can actually start earlier than M1, but
-finally becomes dependent from it.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL???: Tool for Analysis of restricted Python Programs
-- DL???: Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- Initial Complete Self-Contained PyPy Interpreter
-- Initial Measures of Efficiency

Deleted: /pypy/trunk/doc/funding/B6.wp32_bootstrap_redesign.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp32_bootstrap_redesign.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,57 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Specific Analysis and Redesign
-.. |wp|    replace:: WP32
-.. |start| replace:: WP31_
-.. |p1|    replace:: X
-.. |m1|    replace:: 4
-.. |p2|    replace:: Y
-.. |m2|    replace:: 4
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Putting interpreter (WP21_, WP22_) and translator (WP31_) together.
-- Enhancing the PyPy Design.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Part a): Specific Analysis and Redesign**
-
-- Investigate the particular problems that the
-  global translation of PyPy is going to raise.
-- Enhance and redesign parts of PyPy as needed
-  to give best support to the translation of RPython.
-- Re-iterate this until we agree to have reached
-  an optimum solution.
-  
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M2 with WP33_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp33_bootstrap_runtime.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp33_bootstrap_runtime.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,62 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Low Level PyPy Runtime
-.. |wp|    replace:: WP33
-.. |start| replace:: WP31_
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Providing a Runtime Library for PyPy
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-In order to give a working environment to the translated RPython
-program, we need to build the low-level-specific **run-time**
-components of PyPy.
-
-- Design the object layout and implement it.
-- Decide about memory management and implement it.
-- Consider threading support and implement it. Make sure
-  that the other components are thread-aware.
-- Design and implement an efficient multimethod dispatch.
-
-The target language is not yet decided on. We might go different
-paths at the same time.
-If producing C code is a target, important
-parts can be directly re-used from CPython.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-DL??? Runtime Library for PyPy
-DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M2 with WP32_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp40_high_performance.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp40_high_performance.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,50 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: High-performance PyPy-Python
-.. |wp|    replace:: M2
-.. |start| replace:: 0
-.. |p1|    replace:: |e|
-.. |m1|    replace:: |e|
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Optimizing the Bootstrapping in various ways.
-
-Exploring several Object Implementations.
-
-Folding Psyco and Stackless into PyPy.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-This working package consists of the tasks WP41_ WP42_ WP43_ WP44_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M4
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp41_integrate_stackless.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp41_integrate_stackless.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,65 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Integration of Stackless
-.. |wp|    replace:: WP41
-.. |start| replace:: M2
-.. |p1|    replace:: CT
-.. |m1|    replace:: 5
-.. |p2|    replace:: Y
-.. |m2|    replace:: 2
-.. |p3|    replace:: Z
-.. |m3|    replace:: 2
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Integration of Stackless's Technology into PyPy.
-
-- Enable Massive Parallelism in a Single Thread
-
-- Allow Pickling of a Running Program
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Determine which parts of Stackless need to be written in RPython.
-
-- Design Stackless as a meta-component
-  that hooks into the translator (WP31_)
-
-- Implement Stackless partially in RPython, partially in Python,
-  favoring the latter.
-  
-- Implement a dedicated run-time component (WP33_) for Stackless.
-
-- Implement a single-threaded, pre-emptive scheduler with
-  priorities. This is necessary to support small OSes, like WP53_.
-
-- Further develop these technologies based on the results gathered in WP43_, 
-  e.g. identify when these technologies would guide specific choices among the 
-  solutions developed in WP33_ and studying several solutions in WP42_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? to be defined. Green threads, pickling.
-- DL??? Passing all applicable elements of the standard test suite.
-
-**Milestones and Expected Result**
-
-- M3
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp42_several_obj_impl.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp42_several_obj_impl.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,73 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Several Object Implementations
-.. |wp|    replace:: WP42
-.. |start| replace:: M2
-.. |p1|    replace:: X
-.. |m1|    replace:: 4
-.. |p2|    replace:: Y
-.. |m2|    replace:: 4
-.. |p3|    replace:: Z
-.. |m3|    replace:: 4
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Providing several object implementations for
-  - general optimisation
-  - application specific alternatives
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-The following objects are mostly independent from any particular low-level run-time 
-environment.
-
-* Implement dictionaries as hash-table vs. plain (key, value) lists vs. b-trees, 
-  or with string-only or integer-only keys. Dictionaries with specific 
-  support for "on-change" callbacks (useful for Psyco).
-
-* Implement strings as plain immutable memory buffers vs. immutable but more 
-  complex data structures (see functional languages) vs. internally 
-  mutable data structures (e.g. Psyco's concatenated strings)
-
-* Implement ints as machine words vs. two machine words vs. internal longs vs. 
-  external bignum library (investigate if completely unifying ints and
-  longs is possible in the Python language at this stage).
-
-* Consider further objects and do multiple implementations of them.
-
-* Run various performance tests on the above, check for an
-  overall improvement or application dependency.
-  
-* Create reports and merge the results back into the optimization effort.
-  As of general interest, submit the reports as publication.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? to be defined. Publication.
-- DL??? Passing all applicable elements of the standard test
-  suite for every tested alternative.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M4 with M3 WP43_ WP44_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp43_translator_optimisations.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp43_translator_optimisations.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,79 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Translator Optimisations
-.. |wp|    replace:: WP43
-.. |start| replace:: M2
-.. |p1|    replace:: X
-.. |m1|    replace:: 6
-.. |p2|    replace:: Y
-.. |m2|    replace:: 6
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Identification and Implementation of Optimisations
-  through modifications of the Translator.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-The following alternatives are mostly specific to a particular low-level run-time.
-
-* Implement and compare different object layout and memory management strategy 
-  or strategies, e.g. reference counting vs. Boehm garbage collection vs. our own. 
-  Includes speed vs. data size trade-offs.
-
-* Study approaches concerning code size vs. speed trade-offs (e.g. whether the 
-  final interpreter should still include compact precompiled bytecode or be 
-  completely translated into C).
-
-* Solve the complex issue of threading (global interpreter lock vs.
-  alternatives).
-
-* Enhance multimethod dispatching.
-
-* Implement schemes of pointer tagging, e.g. encoding an integer object as a pointer with a 
-  special value instead of a real pointer to a data structure representing 
-  the integer.
-  
-* Run various performance tests on the above, check for an
-  overall improvement or application dependency.
-
-* For each issue, work on **several solutions** when no one is obviously
-  better than the other ones. 
-  
-* Create reports and merge the results back into the optimization effort.
-  As of general interest, submit the reports as publication.
-
-Note that compatibility with legacy C extensions can be achieved by choosing, 
-for each of the following issues, the same one as CPython did.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? to be defined. Publication.
-- DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M4 with M3 WP42_ WP44_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp44_integrate_psyco.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp44_integrate_psyco.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,64 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Integration of Psyco
-.. |wp|    replace:: WP44
-.. |start| replace:: M2
-.. |p1|    replace:: AR
-.. |m1|    replace:: 6
-.. |p2|    replace:: Y
-.. |m2|    replace:: 2
-.. |p3|    replace:: Y
-.. |m3|    replace:: 2
-.. |p4|    replace:: Z
-.. |m4|    replace:: 2
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Integration of Psyco's technology into PyPy.
-
-  - Optimization by Creating Specialized Machine Code at Run-time.
-  - Adressing new Processor Architectures
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Determine which parts of Psyco need to be written in RPython.
-
-- Design Psyco as a meta-component
-  that hooks into the translator (WP31_)
-
-- Implement Psyco partially in RPython, partially in Python,
-  favoring the latter.
-  
-- Implement a dedicated run-time component (WP33_) for Psyco.
-
-- Further develop these technologies based on the results gathered in WP43_, 
-  e.g. identify when these technologies would guide specific choices among the 
-  solutions developed in WP33_ and studying several solutions in WP42_.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? to be defined. Speed boost, architectures.
-- DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M4 with M3 WP42_ WP43_
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp50_validations.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp50_validations.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,48 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Validation of PyPy
-.. |wp|    replace:: WP50
-.. |start| replace:: M4/M3
-.. |p1|    replace:: |e|
-.. |m1|    replace:: |e|
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Validation of the PyPy concept by proving its applicability
-in real applications.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-This working package consists of the tasks WP51_ WP52_ WP53_ WP54_ WP55_ WP56_
-or a subset thereof, dependent of feasibility.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M6 M7 M8 M9
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp51_embedded_device.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp51_embedded_device.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,68 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Porting PyPy to an Embedded Device
-.. |wp|    replace:: WP51
-.. |start| replace:: M2
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Y
-.. |m3|    replace:: 3
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Supporting a completely different platform
-- Providing an efficient, high-level Language for 
-  embedded Devices
-- Proving the flexibility of the PyPy idea
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Analyse the differences between the new architecture and
-  PyPy's current. Deside whether to optimize for code size
-  or applicatin speed.
-
-- Develop the translation process, run-time and those optimisations
-  that depend on low-level details.
-  
-- Implement a simulator for the embedded device.
-
-- Implement interfaces to the needed external libraries.
-
-- Combine different solutions for the different issues discussed in
-  High-performance (WP42_, WP43_, WP44_). 
-  Gather statistics with real-work Python applications.
-  Compare the results. This is where the flexibility of the whole
-  project is vital. Typically, very different trade-offs need to be
-  made on different environments.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? Python running on the embedded device.
-- DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M5
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp52_small_os_pre.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp52_small_os_pre.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,54 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Evaluation whether to do a small OS in PyPy
-.. |wp|    replace:: WP52
-.. |start| replace:: M5
-.. |p1|    replace:: CT
-.. |m1|    replace:: 1
-.. |p2|    replace:: Y
-.. |m2|    replace:: 1
-.. |p3|    replace:: Y
-.. |m3|    replace:: 1
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Deciding whether to build a small Operating System
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Analyse the existing device drivers for the embedded device.
-  Figure out which drivers should be interfaced to, which
-  parts of the BIOS must be interfaced, and what has to be
-  recoded in Python. At least all drivers which have
-  blocking calls must be recoded in in Python.
-  
-- Check whether we need to implement a TCP/IP stack and if this
-  work is doable in reasonable time. If not, then cancel the
-  next WP in favor of another validation WP to be done instead.
-  
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M6
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp53_small_os.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp53_small_os.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,64 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: A small Operating System for an Embedded Device
-.. |wp|    replace:: WP53
-.. |start| replace:: M6
-.. |p1|    replace:: CT
-.. |m1|    replace:: 5
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Y
-.. |m3|    replace:: 3
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-- Building all parts of a small Operating System
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Recode device drivers in Python, according to the results of WP52_.
-  Design tests which ensure functional compatibility with the original
-  ones, as far as these exist.
- 
-- Extend the simulator of WP51_ accordingly.
-  
-- Implement the OS kernel as a set of prioritized tasklets
-  (using the support from WP41_)
-  
-- Implement a simple file system which is accessible by
-  Python, only.
-  
-- Implement a few basic protocols like FTP in order to provide
-  basic access to the internal data of the embedded device.
-  
-- Test the implementation both on the simulator and on the real hardware.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- DL??? Python implements the whole OS of the embedded device.
-- DL??? Passing all applicable elements of the standard test suite.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M7 
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp54_simd_architecture.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp54_simd_architecture.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,69 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Code Generator for SIMD Architecture
-.. |wp|    replace:: WP54
-.. |start| replace:: M4
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Z
-.. |m3|    replace:: 3
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Extending PyPy towards general support of Single Instruction Multiple
-Data (SIMD) architectures.
-Building a concrete implementation for one choosen SIMD architecture.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Select a processor architecture which has SIMD extensions,
-  like SSE2 or AltiVec.
-  Preference should be given to a technology that we are
-  supporting, already.
-
-- Examine the necessary design changes/extensions to PyPy for supporting
-  parallel instructions.
-
-- Extend the code generator to support
-  and optimize for the new instructions.
-  This involves re-iterations of parts of WP32_ and WP43_.
-  Extending Psyco involves WP44_ as well.
-
-- Extend PyPy by an uto-probing feature that tries to
-  examine the availability of certain extensions at runtime.
-
-- Design and implement the necessary vectorised data types
-  for Python/RPython. The extra types should be made sufficient to
-  enable us to write parallel extension modules, and to
-  write the new testing programs.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- Parallel extension for PyPy
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- Extended optimisation towards parallel numerics.
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp55_numerical_package.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp55_numerical_package.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,61 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Enhanced Numerical Package
-.. |wp|    replace:: WP55
-.. |start| replace:: WP54
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Building an enhanced numerical package on top of the SIMD extensions of PyPy.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Decide which numerical extension package to re-implement in PyPy.
-
-- Re-implement the numeric package in terms of applying the
-  new vectorized operations.
-  
-- Make sure that the new implementation passes all tests.
-
-- Provide backward-compatibility of the package in a way that
-  allows it to fall back to a simpler architecture when there
-  is no SIMD extension available.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- Enhanced numerical package
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M8
-
-- We expect to at least reach the efficiency of the existing numerical
-  packages. The target is to outperform these and to get a peformance that
-  is comparable to the efficiency of optimised parallel C libraries.
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp56_load_balancing.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp56_load_balancing.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,52 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Load Balancing in a Multi-Processor environment
-.. |wp|    replace:: WP56
-.. |start| replace:: M3, M4
-.. |p1|    replace:: X
-.. |m1|    replace:: 3
-.. |p2|    replace:: Y
-.. |m2|    replace:: 3
-.. |p3|    replace:: Z
-.. |m3|    replace:: 3
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Implement load balancing for distributed applications.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-*Part a):*
-
-  - work with stackless results *FIXME: write this*
-
-*Part b):*
-
-  - use the whole optimized thing *FIXME: write this*
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- M9
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp60_documentation.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp60_documentation.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,56 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Project Documentation and Dissemination
-.. |wp|    replace:: WP60
-.. |start| replace:: 0
-.. |p1|    replace:: AM
-.. |m1|    replace:: 19
-.. |p2|    replace:: JH
-.. |m2|    replace:: 3
-.. |p3|    replace:: MWH
-.. |m3|    replace:: 3
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Providing ongoing documentation throughout the whole project.
-
-Keeping external groups informed of the ongoings in PyPy.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- During the whole project, maintain and extend a set of documents
-  represends the current status of the project, results of
-  discussions, the planning of new sprints and their status reports,
-  as well as the preparation of papers for presentation on
-  various congresses.
-
-- Send reports of ongoings in the project to the Python Business
-  Forum (PBF) and the Python
-  developers list (python-dev at python.org).
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-- Good documentation and dissemination
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp70_maintenance.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp70_maintenance.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,58 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Maintenance of Tools
-.. |wp|    replace:: WP70
-.. |start| replace:: 0
-.. |p1|    replace:: X
-.. |m1|    replace:: 5
-.. |p2|    replace:: Y
-.. |m2|    replace:: 5
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Supporting the PyPy project by maintaining and enhancing the tools.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Keep the infrastructure up-to-date and develop it further.
-
-  - maintain the Subversion package and track its ongoing development
-  
-  - maintain the Subversion repository
-  
-  - build extensions for automatic document extraction
-  
-  - support email notification via mailing lists
-
-- Provide a mirror repository which is kept up-to-date and which
-  can be used in case of failure of the main repository.
-  
-- Take care of regular repository backups. Design a strict backup
-  policy suitable for the project, and adhere to it.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-.. include:: wp-tableend.asc

Deleted: /pypy/trunk/doc/funding/B6.wp80_synchronisation.txt
==============================================================================
--- /pypy/trunk/doc/funding/B6.wp80_synchronisation.txt	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,60 +0,0 @@
-.. include:: crossreferences.asc
-
-.. |title| replace:: Synchronisation with Standard Python
-.. |wp|    replace:: WP80
-.. |start| replace:: 0
-.. |p1|    replace:: X
-.. |m1|    replace:: 6
-.. |p2|    replace:: |e|
-.. |m2|    replace:: |e|
-.. |p3|    replace:: |e|
-.. |m3|    replace:: |e|
-.. |p4|    replace:: |e|
-.. |m4|    replace:: |e|
-.. |p5|    replace:: |e|
-.. |m5|    replace:: |e|
-.. |p6|    replace:: |e|
-.. |m6|    replace:: |e|
-
-.. include:: wp-toptable.asc
-
-.. include:: wp-tablebegin.asc
-
-**Objectives**
-
-Keeping PyPy in sync with the ongoing changes to Standard Python.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Description of work**
-
-- Monitor the development of Standard Python for its ongoing changes.
-
-- Check the relevance of the changes concerning the structure of
-  PyPy.
-  
-- Embed trivial changes with proper testing, notifying the other
-  concurrent tasks of these changes.
-  
-- Changes which impose larger structural changes must influence
-  the overall design and be discussed with the whole group.
-  It is the responsibility of this task to gather such information
-  as early as possible.
-
-- Also investigate whether there are tools which could automate
-  integration of simple changes, partially.  
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Deliverables**
-
-- Running all tests of PyPy and Stadard Python after every update.
-
-.. include:: wp-tableend.asc
-.. include:: wp-tablebegin.asc
-
-**Milestones and Expected Result**
-
-.. include:: wp-tableend.asc

Modified: pypy/trunk/doc/funding/crossreferences.asc
==============================================================================
--- pypy/trunk/doc/funding/crossreferences.asc	(original)
+++ pypy/trunk/doc/funding/crossreferences.asc	Thu Sep 25 11:27:15 2003
@@ -1,25 +1,25 @@
-.. _WP10: B6.wp10_management.html
-.. _WP20: B6.wp20_interpreter.html
-.. _WP21: B6.wp21_interpreter_completion.html
-.. _WP22: B6.wp22_cpython_to_python.html
-.. _WP30: B6.wp30_compiler.html
-.. _WP31: B6.wp31_translation_of_rpython.html
-.. _WP32: B6.wp32_bootstrap_redesign.html
-.. _WP33: B6.wp33_bootstrap_runtime.html
-.. _WP40: B6.wp40_high_performance.html
-.. _WP41: B6.wp41_integrate_stackless.html
-.. _WP42: B6.wp42_several_obj_impl.html
-.. _WP43: B6.wp43_translator_optimisations.html
-.. _WP44: B6.wp44_integrate_psyco.html
-.. _WP50: B6.wp50_validations.html
-.. _WP51: B6.wp51_embedded_device.html
-.. _WP52: B6.wp52_small_os_pre.html
-.. _WP53: B6.wp53_small_os.html
-.. _WP54: B6.wp54_simd_architecture.html
-.. _WP55: B6.wp55_numerical_package.html
-.. _WP56: B6.wp56_load_balancing.html
-.. _WP60: B6.wp60_documentation.html
-.. _WP70: B6.wp70_maintenance.html
-.. _WP80: B6.wp80_synchronisation.html
+.. _WP10: B6.7.wp10_management.html
+.. _WP20: B6.7.wp20_interpreter.html
+.. _WP21: B6.7.wp21_interpreter_completion.html
+.. _WP22: B6.7.wp22_cpython_to_python.html
+.. _WP30: B6.7.wp30_compiler.html
+.. _WP31: B6.7.wp31_translation_of_rpython.html
+.. _WP32: B6.7.wp32_bootstrap_redesign.html
+.. _WP33: B6.7.wp33_bootstrap_runtime.html
+.. _WP40: B6.7.wp40_high_performance.html
+.. _WP41: B6.7.wp41_integrate_stackless.html
+.. _WP42: B6.7.wp42_several_obj_impl.html
+.. _WP43: B6.7.wp43_translator_optimisations.html
+.. _WP44: B6.7.wp44_integrate_psyco.html
+.. _WP50: B6.7.wp50_validations.html
+.. _WP51: B6.7.wp51_embedded_device.html
+.. _WP52: B6.7.wp52_small_os_pre.html
+.. _WP53: B6.7.wp53_small_os.html
+.. _WP54: B6.7.wp54_simd_architecture.html
+.. _WP55: B6.7.wp55_numerical_package.html
+.. _WP56: B6.7.wp56_load_balancing.html
+.. _WP60: B6.7.wp60_documentation.html
+.. _WP70: B6.7.wp70_maintenance.html
+.. _WP80: B6.7.wp80_synchronisation.html
 
 .. |e| unicode:: 0x20 .. doesn't work with plain spaces
\ No newline at end of file

Modified: pypy/trunk/doc/funding/mkxref.py
==============================================================================
--- pypy/trunk/doc/funding/mkxref.py	(original)
+++ pypy/trunk/doc/funding/mkxref.py	Thu Sep 25 11:27:15 2003
@@ -9,7 +9,7 @@
 # find all work package files, like
 # B6.wp02_cpython_to_python.txt
 
-START_STR = "B6.wp".lower()
+START_STR = "B6.7.wp".lower()
 
 def get_wps_from_dir(as_html=False):
     res = {}

Deleted: /pypy/trunk/doc/funding/uncrappify.py
==============================================================================
--- /pypy/trunk/doc/funding/uncrappify.py	Thu Sep 25 11:27:15 2003
+++ (empty file)
@@ -1,14 +0,0 @@
-# very simple repair to Armin's mess :-)
-
-import os, sys
-
-if sys.platform != "win32":
-    raise TypeError, "this won't work on %s" % sys.platform
-
-for fname in os.listdir("."):
-    pre, ext = os.path.splitext(fname)
-    if ext.lower() in (".txt", ".py"):
-        txt = file(fname, "rb").read()
-        txt = txt.replace("\r\n\n\r\n\n", "\r\n")
-        file(fname, "wb").write(txt)
-        
\ No newline at end of file


More information about the Pypy-commit mailing list