Skip to content

Commit

Permalink
update v1.34 - v2.0 in several places (chapel-lang#24533)
Browse files Browse the repository at this point in the history
This PR updates the Chapel version number in advance of the release of
Chapel 2.0.

Updates to the major version were caught in mason tests which check for
compatibility of package dependencies w.r.t the chapel version. I
updated the `.good` file to expect a more recent version of the
dependency, based on the updated version of Chapel



TESTING:
- [x] paratest `[Summary: #Successes = 17145 | #Failures = 0 | #Futures
= 917]`
- [x] make docs, ensure 2.0 displayed instead of 1.34

[reviewed by @mppf - thanks!]
  • Loading branch information
arezaii authored Mar 11, 2024
2 parents 8831f71 + 54ccc0b commit 052dbb0
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Handle all (most?) the versioning information in one place
# These values will be written to <build_dir>/frontend/include/chpl/config/config.h

set(CHPL_MAJOR_VERSION 1)
set(CHPL_MINOR_VERSION 34)
set(CHPL_MAJOR_VERSION 2)
set(CHPL_MINOR_VERSION 0)
set(CHPL_PATCH_VERSION 0)
set(CHPL_BUILD_VERSION 0)

Expand Down
8 changes: 4 additions & 4 deletions doc/rst/language/evolution.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ The purpose of this flag is to identify portions of a program that use a
language or library feature has recently changed meaning or which is
expected to change meaning in the future.

version 1.34, March 2024
version 2.0, March 2024
------------------------

.. _readme-evolution.default-task-intent-arrays:

Default task intents for arrays
*******************************

In 1.34, the default task intent for an array is now determined by the outer
In 2.0, the default task intent for an array is now determined by the outer
variable. If the outer array is ``const`` then the default intent is ``const``,
otherwise the default intent is ``ref``. Therefore, if an array is modifiable
outside a parallel block, it is modifiable inside the parallel block. It is no
Expand All @@ -44,8 +44,8 @@ The default task intent for ``A`` is ``ref``, since the argument formal ``A``
is mutable. This simplifies parallel code, making it simpler and cleaner to
write.

Prior to 1.34, the above ``begin`` would have resulted in a deprecation
warning. In 1.34, this is valid code again.
Prior to 2.0, the above ``begin`` would have resulted in a deprecation
warning. In 2.0, this is valid code again.

version 1.32, September 2023
----------------------------
Expand Down
4 changes: 2 additions & 2 deletions doc/rst/technotes/driver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ subprocesses depending on which backend is used. By contrast, many compiler
executables (including ``gcc`` and ``clang``) are actually `compiler drivers`.
A compiler driver is a smaller program responsible for processing arguments and
invoking separate processes for the different stages of compilation required. As
of release 1.34, ``chpl`` runs as a compiler driver by default, with the
of release 2.0, ``chpl`` runs as a compiler driver by default, with the
following phases run as separate subprocesses:

- ``compilation``: Everything through code generation (C code or LLVM bitcode).
Expand Down Expand Up @@ -82,7 +82,7 @@ Development History
phases: `compilation`, which is responsible for everything through code
generation (C code or LLVM bitcode), and `makeBinary`, which is responsible
for binary generation (including linking).
- In release 1.34, the driver mode is on by default, and the
- In release 2.0, the driver mode is on by default, and the
``--compiler-driver`` flag is unstable. The new unstable
``--no-compiler-driver`` flag allows opting out of the driver mode and will
cause the compiler to run monolithically as before. Both flags will be removed
Expand Down
2 changes: 1 addition & 1 deletion doc/rst/technotes/ioSerializers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ serialization and deserialization.
In Chapel 1.32, Serializers and Deserializers are enabled by default. Users
wishing to opt-out of this capability can recompile their programs with
the config param ``useIOSerializers`` set to ``false``. This config param
will be available through the Chapel 1.34 release at minimum.
will be available through the Chapel 2.0 release at minimum.

API Changes to Standard IO
--------------------------
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/uast/post-parse-checks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ void Visitor::checkSparseKeyword(const FnCall* node) {
" their behavior is likely to change in the future.");
}

// TODO: remove this check and warning after 1.34?
// TODO: remove this check and warning after 2.0?
void Visitor::checkPrimCallInUserCode(const PrimCall* node) {
// suppress this warning from chpldoc
if (isUserCode())
Expand Down Expand Up @@ -1648,7 +1648,7 @@ void Visitor::checkOtherwiseAfterWhens(const Select* sel) {
if (seenOtherwise && !when->isOtherwise()) {
CHPL_REPORT(context_, WhenAfterOtherwise, sel, seenOtherwise, when);
break;
}
}
if (when->isOtherwise()) seenOtherwise = when;
}
}
Expand Down
2 changes: 1 addition & 1 deletion man/confchpl.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

:Version: 1.34.0 pre-release
:Version: 2.0.0 pre-release
:Manual section: 1
:Title: \\fBchpl\\fP
:Subtitle: Compiler for the Chapel Programming Language
2 changes: 1 addition & 1 deletion man/confchpldoc.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

:Version: 1.34.0 pre-release
:Version: 2.0.0 pre-release
:Manual section: 1
:Title: \\fBchpldoc\\fP
:Subtitle: the Chapel Documentation Tool
2 changes: 1 addition & 1 deletion test/compflags/bradc/printstuff/version.goodstart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 1.34.0
version 2.0.0
2 changes: 1 addition & 1 deletion test/deprecated/chplCommGetPut.chpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Test to make sure we do/don't warn about the changed behavior (depending on
if using chpl or chpldoc) in these primitives from v1.31 to v1.32.
Should remove when we stop warning about the change, likely with v1.34.
Should remove when we stop warning about the change.
*/

inline proc GET(addr, node, rAddr, size) {
Expand Down
6 changes: 3 additions & 3 deletions test/mason/chplVersion/tomls/pass/ivrsChooses.good
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ version = "0.1.0"
chplVersion = "CHPL_CUR_FULL..CHPL_CUR_FULL"
name = "badThenGood"
source = "foo"
version = "0.2.0"
version = "0.3.0"

[usesBad]
chplVersion = "CHPL_CUR_FULL..CHPL_CUR_FULL"
dependencies = ["badThenGood 0.2.0 foo"]
dependencies = ["badThenGood 0.3.0 foo"]
name = "usesBad"
source = "foo"
version = "0.1.0"

[usesGood]
chplVersion = "CHPL_CUR_FULL..CHPL_CUR_FULL"
dependencies = ["badThenGood 0.2.0 foo"]
dependencies = ["badThenGood 0.3.0 foo"]
name = "usesGood"
source = "foo"
version = "0.1.0"
Expand Down

0 comments on commit 052dbb0

Please sign in to comment.